The "SharixAdmin" module has been renamed to "sharix_admin", in accordance with the chosen naming standard.

If you have problems with installation and startup of the project, recreate the virtual environment *venv/* and delete all *__pycache__/* directories.

SharixAdmin/api/serializers/__init__.py

@@ -1 +0,0 @@
-from SharixAdmin.api.serializers.custom_token import CustomTokenSerializer

SharixAdmin/templates/SharixAdmin/schema.html

@@ -1,10 +0,0 @@
-{% extends 'SharixAdmin/base.html' %}
-{% load static %}
-
-{% block content %}
-    
-     <div class="container-fluid" style="width: 100%;" >
-        <img src="{% static 'SharixAdmin/img/schemav3.png' %}" /> 
-    </div> 
-    
-{% endblock content %}

core/settings.py

@@ -37,7 +37,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'user.apps.UserConfig',
-    'SharixAdmin.apps.SharixadminConfig',
+    'sharix_admin.apps.ShariXAdminConfig',
     'tickets.apps.TicketsConfig',
     'dbsynce.apps.DbsyncedConfig',
     'webservice_running.apps.WebserviceRunningConfig',
@@ -192,7 +192,7 @@ JAZZMIN_SETTINGS = {
     "site_brand": "ShariX Platform",
 
     # Logo to use for your site, must be present in static files, used for brand on top left
-    "site_logo": "SharixAdmin/img/logo.png",
+    "site_logo": "sharix_admin/img/logo.png",
 
     # Logo to use for your site, must be present in static files, used for login form logo (defaults to site_logo)
     "login_logo": None,
@@ -214,7 +214,7 @@ JAZZMIN_SETTINGS = {
 
     # List of model admins to search from the search bar, search bar omitted if excluded
     # If you want to use a single search field you dont need to use a list, you can use a simple string 
-    "search_model": ["SharixAdmin.SharixUser"],
+    "search_model": ["sharix_admin.SharixUser"],
 
     # Field name on user model that contains avatar ImageField/URLField/Charfield or a callable that receives the user
     "user_avatar": "",
@@ -233,7 +233,7 @@ JAZZMIN_SETTINGS = {
         #{"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True},
 
         # model admin to link to (Permissions checked against model)
-        {"model": "SharixAdmin.SharixUser"},
+        {"model": "sharix_admin.SharixUser"},
 
         # App with dropdown menu to all its models pages (Permissions checked against models)
         {"app": "tickets"},
@@ -246,7 +246,7 @@ JAZZMIN_SETTINGS = {
     # Additional links to include in the user menu on the top right ("app" url type is not allowed)
     # "usermenu_links": [
     #     {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True},
-    #     {"model": "SharixAdmin.SharixUser"}
+    #     {"model": "sharix_admin.SharixUser"}
     # ],
 
     # #############
@@ -284,8 +284,8 @@ JAZZMIN_SETTINGS = {
         "auth": "fas fa-users-cog",
         "auth.user": "fas fa-user",
         "auth.Group": "fas fa-users",
-        "SharixAdmin": "fas fa-users-cog",
-        "SharixAdmin.SharixUser": "fas fa-user",
+        "sharix_admin": "fas fa-users-cog",
+        "sharix_admin.SharixUser": "fas fa-user",
         "tickets.Task": "fas fa-check",
         "tickets.TaskList": "fas fa-list",
         "tickets.Comment": "fas fa-comment",
@@ -323,7 +323,7 @@ JAZZMIN_SETTINGS = {
     # - carousel
     #"changeform_format": "horizontal_tabs",
     # override change forms on a per modeladmin basis
-    #"changeform_format_overrides": {"SharixAdmin.SharixUser": "collapsible", "auth.group": "vertical_tabs"},
+    #"changeform_format_overrides": {"sharix_admin.SharixUser": "collapsible", "auth.group": "vertical_tabs"},
     # Add a language dropdown into the admin
     #"language_chooser": True,
 }
@@ -388,7 +388,7 @@ REST_FRAMEWORK = {
 }
 
 SPAGHETTI_SAUCE = {
-    'apps': ['auth', 'SharixAdmin', 
+    'apps': ['auth', 'sharix_admin', 
                 'tickets', 'admin', 
                 'flatpages', 'sessions', 'sites', 'dbsynce'],
     'show_fields': False,

core/urls.py

@@ -9,7 +9,7 @@ urlpatterns = [
     path('admin/', admin.site.urls),
 ] + i18n_patterns(
         path('i18n/', include('django.conf.urls.i18n')),
-        path('', include('SharixAdmin.urls')),
+        path('', include('sharix_admin.urls')),
         path('tickets/', include('tickets.urls', namespace='tickets'), name='tickets'),
         path('design/', include("design_template.urls"), name='design'),
         path('dbsynce/', include("dbsynce.urls"), name="dbsynce"),

SharixAdmin/admin.py → sharix_admin/admin.py

@@ -35,7 +35,7 @@ def send_phone(modeladmin, request, queryset):
     else:
         form = MessageForm(initial={'_selected_action': request.POST.getlist("_selected_action")})
            
-    return render(request, "SharixAdmin/senderform.html", {"items":queryset, "form":form, 'title':'Отправка сообщений на номер телефона'})
+    return render(request, "sharix_admin/senderform.html", {"items":queryset, "form":form, 'title':'Отправка сообщений на номер телефона'})
 send_phone.short_description = u"Отправить сообщение на номер телефона"
 
 @admin.register(Permission)

sharix_admin/api/serializers/__init__.py

@@ -0,0 +1 @@
+from sharix_admin.api.serializers.custom_token import CustomTokenSerializer

SharixAdmin/apps.py → sharix_admin/apps.py

@@ -1,11 +1,10 @@
 from django.apps import AppConfig
 
 
-
-class SharixadminConfig(AppConfig):
+class ShariXAdminConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'SharixAdmin'
+    name = 'sharix_admin'
     verbose_name = "SHARIX_OPEN"
 
     def ready(self):
-       import SharixAdmin.signals
+       import sharix_admin.signals

SharixAdmin/locale/ru/LC_MESSAGES/django.po → sharix_admin/locale/ru/LC_MESSAGES/django.po

@@ -89,19 +89,19 @@ msgstr "Стоимость мин."
 msgid "Cost of service"
 msgstr "Стоимость услуги"
 
-#: .\templates\SharixAdmin\auth.html:10
+#: .\templates\sharix_admin\auth.html:10
 msgid "Log in"
 msgstr "Авторизуйтесь"
 
-#: .\templates\SharixAdmin\auth.html:26
+#: .\templates\sharix_admin\auth.html:26
 msgid "Please, enter the correct phone number and password."
 msgstr "Пожалуйста, введите правильный номер телефона и пароль."
 
-#: .\templates\SharixAdmin\auth.html:29
+#: .\templates\sharix_admin\auth.html:29
 msgid "Login"
 msgstr "Войти"
 
-#: .\templates\SharixAdmin\balance.html:11
+#: .\templates\sharix_admin\balance.html:11
 msgid ""
 "Payment by card and bank details is available. When paying for an order with "
 "a bank card, <br> payment processing takes place on the page of the PAYMO "
@@ -111,7 +111,7 @@ msgstr ""
 "помощью банковская карта, <br> обработка платежа происходит на странице "
 "PAYMO поставщик платежей."
 
-#: .\templates\SharixAdmin\balance.html:14
+#: .\templates\sharix_admin\balance.html:14
 msgid ""
 "You will need to enter your bank card details: MIR; VISA International; <br> "
 "Mastercard Worldwide."
@@ -119,16 +119,16 @@ msgstr ""
 "Вам нужно будет ввести данные вашей банковской карты: MIR; VISA "
 "International; <br> Mastercard Worldwide."
 
-#: .\templates\SharixAdmin\balance.html:17
+#: .\templates\sharix_admin\balance.html:17
 msgid "3D-Secure maps only."
 msgstr "Только защищенные 3D-карты."
 
-#: .\templates\SharixAdmin\balance.html:21
-#: .\templates\SharixAdmin\balance.html:22
+#: .\templates\sharix_admin\balance.html:21
+#: .\templates\sharix_admin\balance.html:22
 msgid "Enter the required amount"
 msgstr "Введите требуемую сумму"
 
-#: .\templates\SharixAdmin\balance.html:25
+#: .\templates\sharix_admin\balance.html:25
 msgid ""
 "After replenishment, the funds can be used to pay for the services of "
 "subsidiary services."
@@ -136,19 +136,19 @@ msgstr ""
 "После пополнения средства могут быть использованы для оплаты услуг "
 "вспомогательных служб."
 
-#: .\templates\SharixAdmin\balance.html:34
+#: .\templates\sharix_admin\balance.html:34
 msgid "Replenish"
 msgstr "Пополнить"
 
-#: .\templates\SharixAdmin\balance.html:36
+#: .\templates\sharix_admin\balance.html:36
 msgid "Back"
 msgstr "Назад"
 
-#: .\templates\SharixAdmin\balance.html:40
+#: .\templates\sharix_admin\balance.html:40
 msgid "Requisites"
 msgstr "Реквизиты"
 
-#: .\templates\SharixAdmin\balance.html:42
+#: .\templates\sharix_admin\balance.html:42
 msgid ""
 "<p>Legal address:<b>199155, the city of St. Petersburg, Zheleznovodskaya "
 "street, house 32 letter d, room 22-n office 1-8</b></p> <p>Email: "
@@ -164,156 +164,156 @@ msgstr ""
 "<p>Текущий счет: <b>40702810800400000025</b></p> <p>Корреспондент учетная "
 "запись: <b>30101810645250000610</b></p>"
 
-#: .\templates\SharixAdmin\index.html:17
+#: .\templates\sharix_admin\index.html:17
 msgid "ShariX Menu"
 msgstr "Sharix Меню"
 
-#: .\templates\SharixAdmin\index.html:32
+#: .\templates\sharix_admin\index.html:32
 msgid "Change"
 msgstr ""
 
-#: .\templates\SharixAdmin\index.html:84
+#: .\templates\sharix_admin\index.html:84
 msgid "Contacts"
 msgstr "Контакты"
 
-#: .\templates\SharixAdmin\index.html:85
+#: .\templates\sharix_admin\index.html:85
 msgid "Terms of use"
 msgstr "Условия использования"
 
-#: .\templates\SharixAdmin\index.html:86 .\templates\SharixAdmin\main.html:12
+#: .\templates\sharix_admin\index.html:86 .\templates\sharix_admin\main.html:12
 msgid "Privacy policy"
 msgstr "Политика конфиденциальности"
 
-#: .\templates\SharixAdmin\index.html:88
+#: .\templates\sharix_admin\index.html:88
 msgid "Log out"
 msgstr "Выйти"
 
-#: .\templates\SharixAdmin\main.html:11
+#: .\templates\sharix_admin\main.html:11
 msgid "Documentation"
 msgstr "Документация"
 
-#: .\templates\SharixAdmin\main.html:13
+#: .\templates\sharix_admin\main.html:13
 msgid "Rules for the provision of services"
 msgstr "Правила предоставления услуг"
 
-#: .\templates\SharixAdmin\main.html:14
+#: .\templates\sharix_admin\main.html:14
 msgid "Procedure for the provision of services"
 msgstr "Порядок предоставления услуг"
 
-#: .\templates\SharixAdmin\main.html:15
+#: .\templates\sharix_admin\main.html:15
 msgid "List of services"
 msgstr "Перечень предоставляемых услуг"
 
-#: .\templates\SharixAdmin\main.html:16
+#: .\templates\sharix_admin\main.html:16
 msgid "Scheme 1"
 msgstr "Схема 1"
 
-#: .\templates\SharixAdmin\main.html:16
+#: .\templates\sharix_admin\main.html:16
 msgid "Scheme 2"
 msgstr "Схема 2"
 
-#: .\templates\SharixAdmin\main.html:16
+#: .\templates\sharix_admin\main.html:16
 msgid "Scheme 3"
 msgstr "Схема 3"
 
-#: .\templates\SharixAdmin\main.html:16
+#: .\templates\sharix_admin\main.html:16
 msgid "API Docs"
 msgstr "Документация по API"
 
-#: .\templates\SharixAdmin\main.html:21
+#: .\templates\sharix_admin\main.html:21
 #, python-format
 msgid "<p>User: <b>%(user)s</b></p>"
 msgstr "<p>Пользователь: <b>%(user)s</b></p>"
 
-#: .\templates\SharixAdmin\main.html:24
+#: .\templates\sharix_admin\main.html:24
 #, python-format
 msgid "<p>Phone number: <b>%(phone)s</b></p>"
 msgstr "<p>Номер телефона: <b>%(phone)s</b></p>"
 
-#: .\templates\SharixAdmin\main.html:27
+#: .\templates\sharix_admin\main.html:27
 #, python-format
 msgid "<p>Date of registration: <b>%(date)s</b></p>"
 msgstr "<p>Дата регистрации: <b>%(date)s</b></p>"
 
-#: .\templates\SharixAdmin\main.html:30
+#: .\templates\sharix_admin\main.html:30
 #, python-format
 msgid "<p>Balance: <b>%(balance)s points</b></p>"
 msgstr "<p>Баланс: <b>%(balance)s баллов</b></p>"
 
-#: .\templates\SharixAdmin\main.html:33
+#: .\templates\sharix_admin\main.html:33
 msgid "Buy points"
 msgstr "Купить баллы"
 
-#: .\templates\SharixAdmin\partner_information_form.html:19
-#: .\templates\SharixAdmin\senderform.html:10
-#: .\templates\SharixAdmin\service_information_form.html:23
-#: .\templates\SharixAdmin\service_tariff_form.html:19
-#: .\templates\SharixAdmin\service_type_form.html:19
+#: .\templates\sharix_admin\partner_information_form.html:19
+#: .\templates\sharix_admin\senderform.html:10
+#: .\templates\sharix_admin\service_information_form.html:23
+#: .\templates\sharix_admin\service_tariff_form.html:19
+#: .\templates\sharix_admin\service_type_form.html:19
 msgid "Submit"
 msgstr "Отправить"
 
-#: .\templates\SharixAdmin\senderform.html:7
+#: .\templates\sharix_admin\senderform.html:7
 msgid "The message will be sent to the following users:"
 msgstr "Сообщение будет отправлено следующим пользователям:"
 
-#: .\templates\SharixAdmin\senderform.html:9
+#: .\templates\sharix_admin\senderform.html:9
 msgid "send_phone"
 msgstr "Отправить телефон"
 
-#: .\templates\SharixAdmin\service_tariff.html:48
-#: .\templates\SharixAdmin\service_type.html:48
+#: .\templates\sharix_admin\service_tariff.html:48
+#: .\templates\sharix_admin\service_type.html:48
 msgid "Add"
 msgstr "Добавить"
 
-#: .\templates\SharixAdmin\service_type_delete.html:9
+#: .\templates\sharix_admin\service_type_delete.html:9
 #, python-format
 msgid "Are you sure you want to delete \\\"%%(object.caption)s\\\"?"
 msgstr "Вы уверены, что хотите удалить \\\"%%(object.caption)s\\\"?"
 
-#: .\templates\SharixAdmin\service_type_delete.html:12
+#: .\templates\sharix_admin\service_type_delete.html:12
 msgid "Delete"
 msgstr "Удалить"
 
-#: .\templates\SharixAdmin\test.html:7
+#: .\templates\sharix_admin\test.html:7
 msgid "These pages are under development"
 msgstr "Данные страницы находятся в разработке"
 
-#: .\templates\SharixAdmin\trans_carried.html:6
-#: .\templates\SharixAdmin\transactions.html:7
+#: .\templates\sharix_admin\trans_carried.html:6
+#: .\templates\sharix_admin\transactions.html:7
 msgid "User: "
 msgstr "Пользователь: "
 
-#: .\templates\SharixAdmin\trans_carried.html:7
+#: .\templates\sharix_admin\trans_carried.html:7
 msgid "Balance: "
 msgstr "Баланс: "
 
-#: .\templates\SharixAdmin\trans_carried.html:15
+#: .\templates\sharix_admin\trans_carried.html:15
 msgid "Price: "
 msgstr "Цена: "
 
-#: .\templates\SharixAdmin\trans_carried.html:16
+#: .\templates\sharix_admin\trans_carried.html:16
 msgid "Owner: "
 msgstr "Владелец: "
 
-#: .\templates\SharixAdmin\trans_carried.html:17
+#: .\templates\sharix_admin\trans_carried.html:17
 msgid "Date of service: "
 msgstr "Дата предоставления услуги: "
 
-#: .\templates\SharixAdmin\trans_carried.html:18
+#: .\templates\sharix_admin\trans_carried.html:18
 msgid "Conducted: "
 msgstr "Проведен: "
 
-#: .\templates\SharixAdmin\trans_carried.html:23
+#: .\templates\sharix_admin\trans_carried.html:23
 msgid "Spend"
 msgstr "Потратить"
 
-#: .\templates\SharixAdmin\transactions.html:8
+#: .\templates\sharix_admin\transactions.html:8
 #, python-format
 msgid "Balance: %(wallet.balance)s points"
 msgstr "Баланс: %(wallet.balance)s баллов"
 
-#: .\templates\SharixAdmin\transactions.html:11
-#: .\templates\SharixAdmin\transactions.html:12
+#: .\templates\sharix_admin\transactions.html:11
+#: .\templates\sharix_admin\transactions.html:12
 msgid "Search"
 msgstr "Поиск"
 

SharixAdmin/templates/drf-yasg/redoc.html → sharix_admin/templates/drf-yasg/redoc.html

@@ -12,11 +12,11 @@
 
     {% block favicon %}
         {# -- Maybe replace the favicon -- #}
-        <link rel="icon" type="image/png" href="{% static 'SharixAdmin/img/logo.svg' %}"/>
+        <link rel="icon" type="image/png" href="{% static 'sharix_admin/img/logo.svg' %}"/>
     {% endblock %}
 
     {% block main_styles %}
-        <link rel="stylesheet" type="text/css" href="{% static 'SharixAdmin/style.css' %}"/>
+        <link rel="stylesheet" type="text/css" href="{% static 'sharix_admin/style.css' %}"/>
     {% endblock %}
     {% block extra_styles %}
         {# -- Add any additional CSS scripts here -- #}

SharixAdmin/templates/SharixAdmin/auth.html → sharix_admin/templates/sharix_admin/auth.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/base.html' %}
+{% extends 'sharix_admin/base.html' %}
 {% load i18n %}
 {% load static %}
 
@@ -6,7 +6,7 @@
 <div class="text-center" style="margin-top: 150px;">
     <div class="form-signin" style="width: 100%; max-width:330px; margin: auto; display:block;">
         <form class="m-2 p-2" method="post">
-            <img class="mb-4" style="height: 100px;" src="{% static 'SharixAdmin/img/logo.png' %}" alt="" >
+            <img class="mb-4" style="height: 100px;" src="{% static 'sharix_admin/img/logo.png' %}" alt="" >
             <h1 class="h3 mb-3 fw-normal">{% trans 'Log in' %} в {{ NameSystem }}</h1>
             {% csrf_token %}
             

SharixAdmin/templates/SharixAdmin/balance.html → sharix_admin/templates/sharix_admin/balance.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 {% load static %}
 
@@ -28,11 +28,11 @@
                     <p>{% trans 'After replenishment, the funds can be used to pay for the services of subsidiary services.' %}</p>
                     <br>
                     <div>
-                        <img src="{% static 'SharixAdmin/img/visa.png' %}" alt="">
-                        <img src="{% static 'SharixAdmin/img/mc.png' %}" alt="">
-                        <img src="{% static 'SharixAdmin/img/mir.png' %}" alt="">
+                        <img src="{% static 'sharix_admin/img/visa.png' %}" alt="">
+                        <img src="{% static 'sharix_admin/img/mc.png' %}" alt="">
+                        <img src="{% static 'sharix_admin/img/mir.png' %}" alt="">
                         <br>
-                        <img src="{% static 'SharixAdmin/img/paymo.png' %}" alt="">
+                        <img src="{% static 'sharix_admin/img/paymo.png' %}" alt="">
                     </div>
                     <button class="btn btn-primary mt-5 mb-3">{% trans 'Replenish' %}</button>
                     <br>

SharixAdmin/templates/SharixAdmin/balance_success.html → sharix_admin/templates/sharix_admin/balance_success.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 
 {% block contenthome %}
     <h1 >{{ title }}</h1>

SharixAdmin/templates/SharixAdmin/base.html → sharix_admin/templates/sharix_admin/base.html

@@ -6,11 +6,11 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" href="{% static 'SharixAdmin/img/logo.png' %}">
-    <link rel="stylesheet" href="{% static 'SharixAdmin/css/bootstrap.min.css' %}">
+    <link rel="shortcut icon" href="{% static 'sharix_admin/img/logo.png' %}">
+    <link rel="stylesheet" href="{% static 'sharix_admin/css/bootstrap.min.css' %}">
     <link rel="stylesheet" href="{% static 'drf-yasg/service_type.css' %}">
     <link rel="stylesheet" href="{% static 'drf-yasg/colors2.css' %}">
-    <link rel="stylesheet" href="{% static 'SharixAdmin/css/style.css' %}">
+    <link rel="stylesheet" href="{% static 'sharix_admin/css/style.css' %}">
 
     <link href="{% static 'fontawesomefree/css/fontawesome.css' %}" rel="stylesheet" type="text/css">
     <link href="{% static 'fontawesomefree/css/brands.css' %}" rel="stylesheet" type="text/css">
@@ -21,6 +21,6 @@
 <body>
     {% block content %}{% endblock %}
     
-    <script src="{% static 'SharixAdmin/js/bootstrap.bundle.min.js' %}"></script>
+    <script src="{% static 'sharix_admin/js/bootstrap.bundle.min.js' %}"></script>
 </body>
 </html>

SharixAdmin/templates/SharixAdmin/cooperate.html → sharix_admin/templates/sharix_admin/cooperate.html

@@ -1,10 +1,10 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 
 {% block contenthome %}
 <p class="description_service">Товарищи! Консультация с широким активом требуют определения и уточнения существенных финансовых и административных условий. Идейные соображения высшего порядка, а также постоянный количественный рост и сфера нашей активности обеспечивает широкому кругу (специалистов) участие в формировании форм развития. </p>
 <form method="post" class="d-flex flex-column align-items-end">
     {% csrf_token %}
-    {% include 'SharixAdmin/include/form.html' %}
+    {% include 'sharix_admin/include/form.html' %}
     <button class="btn btn-primary" type="submit">Отправить</button>
 </form>
 {% endblock %}

SharixAdmin/templates/SharixAdmin/index.html → sharix_admin/templates/sharix_admin/index.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/base.html' %}
+{% extends 'sharix_admin/base.html' %}
 {% load i18n %}
 {% load static %}
 
@@ -10,7 +10,7 @@
 <div class="content p-4 mx-auto d-flex flex-column justify-content-between">
   <nav id="menu-bar">
     <button class="bg-white border box-shadow rounded mb-2 px-4 py-1" onclick="menuBarSwitch()">
-        <img id="menu-bar-img-arrow" src="{% static 'SharixAdmin/img/menu/arrow-right.svg' %}">
+        <img id="menu-bar-img-arrow" src="{% static 'sharix_admin/img/menu/arrow-right.svg' %}">
     </button>
 
     <ul class="d-flex flex-column nav nav-pills rounded box-shadow border p-2 bg-white">
@@ -21,9 +21,9 @@
               class="nav-img"
               src="
                 {% if current_page == "index" %}
-                  {% static 'SharixAdmin/img/menu/house_w.svg' %}
+                  {% static 'sharix_admin/img/menu/house_w.svg' %}
                 {% else %}
-                  {% static 'SharixAdmin/img/menu/house.svg' %}
+                  {% static 'sharix_admin/img/menu/house.svg' %}
                 {% endif %}">
             <span class="menu-bar-label">Главная</span>
           </div>
@@ -36,9 +36,9 @@
               class="nav-img"
               src="
                 {% if current_page == "tickets" %}
-                  {% static 'SharixAdmin/img/menu/tickets_w.svg' %}
+                  {% static 'sharix_admin/img/menu/tickets_w.svg' %}
                 {% else %}
-                  {% static 'SharixAdmin/img/menu/tickets.svg' %}
+                  {% static 'sharix_admin/img/menu/tickets.svg' %}
                 {% endif %}"> 
             <span class="menu-bar-label">Заявки</span>
           </div>
@@ -51,9 +51,9 @@
               class="nav-img"
               src="
                 {% if current_page == "education" %}
-                  {% static 'SharixAdmin/img/menu/education_w.svg' %}
+                  {% static 'sharix_admin/img/menu/education_w.svg' %}
                 {% else %}
-                  {% static 'SharixAdmin/img/menu/education.svg' %}
+                  {% static 'sharix_admin/img/menu/education.svg' %}
                 {% endif %}">
             <span class="menu-bar-label">Курсы</span>
           </div>
@@ -66,9 +66,9 @@
               class="nav-img"
               src="
                 {% if current_page == "partners" %}
-                  {% static 'SharixAdmin/img/menu/people_w.svg' %}
+                  {% static 'sharix_admin/img/menu/people_w.svg' %}
                 {% else %}
-                  {% static 'SharixAdmin/img/menu/people.svg' %}
+                  {% static 'sharix_admin/img/menu/people.svg' %}
                 {% endif %}">
             <span class="menu-bar-label">Партнеры</span>
           </div>
@@ -82,9 +82,9 @@
                 class="nav-img"
                 src="
                   {% if current_page == "cooperate" %}
-                    {% static 'SharixAdmin/img/menu/handshake_w.svg' %}
+                    {% static 'sharix_admin/img/menu/handshake_w.svg' %}
                   {% else %}
-                    {% static 'SharixAdmin/img/menu/handshake.svg' %}
+                    {% static 'sharix_admin/img/menu/handshake.svg' %}
                   {% endif %}">
               <span class="menu-bar-label">Сотрудничество</span>
             </div>
@@ -98,9 +98,9 @@
               class="nav-img"
               src="
                 {% if current_page == "none" %}
-                  {% static 'SharixAdmin/img/menu/hdd-network_w.svg' %}
+                  {% static 'sharix_admin/img/menu/hdd-network_w.svg' %}
                 {% else %}
-                  {% static 'SharixAdmin/img/menu/hdd-network.svg' %}
+                  {% static 'sharix_admin/img/menu/hdd-network.svg' %}
                 {% endif %}">
             <span class="menu-bar-label">Управление правами</span>
           </div>
@@ -113,9 +113,9 @@
               class="nav-img"
               src="
                 {% if current_page == "service_type" %}
-                  {% static 'SharixAdmin/img/menu/briefcase_w.svg' %}
+                  {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
                 {% else %}
-                  {% static 'SharixAdmin/img/menu/briefcase.svg' %}
+                  {% static 'sharix_admin/img/menu/briefcase.svg' %}
                 {% endif %}">
             <span class="menu-bar-label">Услуги сервиса</span>
           </div>
@@ -128,9 +128,9 @@
               class="nav-img"
               src="
                 {% if current_page == "transactions" %}
-                  {% static 'SharixAdmin/img/menu/clock-history_w.svg' %}
+                  {% static 'sharix_admin/img/menu/clock-history_w.svg' %}
                 {% else %}
-                  {% static 'SharixAdmin/img/menu/clock-history.svg' %}
+                  {% static 'sharix_admin/img/menu/clock-history.svg' %}
                 {% endif %}">
             <span class="menu-bar-label">История заказов</span>
           </div>
@@ -144,9 +144,9 @@
                 class="nav-img"
                 src="
                   {% if current_page == 'partner' %}
-                    {% static 'SharixAdmin/img/menu/person_w.svg' %}
+                    {% static 'sharix_admin/img/menu/person_w.svg' %}
                   {% else %}
-                    {% static 'SharixAdmin/img/menu/person.svg' %}
+                    {% static 'sharix_admin/img/menu/person.svg' %}
                   {% endif %}">
               <span class="menu-bar-label">О партнере</span>
             </div>
@@ -160,9 +160,9 @@
               class="nav-img"
               src="
                 {% if current_page == "service_info" %}
-                  {% static 'SharixAdmin/img/menu/person_w.svg' %}
+                  {% static 'sharix_admin/img/menu/person_w.svg' %}
                 {% else %}
-                  {% static 'SharixAdmin/img/menu/person.svg' %}
+                  {% static 'sharix_admin/img/menu/person.svg' %}
                 {% endif %}">
             <span class="menu-bar-label">Информация о сервисе</span>
           </div>
@@ -175,9 +175,9 @@
               class="nav-img"
               src="
                 {% if current_page == "payment" %}
-                  {% static 'SharixAdmin/img/menu/credit-card_w.svg' %}
+                  {% static 'sharix_admin/img/menu/credit-card_w.svg' %}
                 {% else %}
-                  {% static 'SharixAdmin/img/menu/credit-card.svg' %}
+                  {% static 'sharix_admin/img/menu/credit-card.svg' %}
                 {% endif %}">
             <span class="menu-bar-label">Оплата</span>
           </div>
@@ -198,7 +198,7 @@
 
   <footer class="d-flex justify-content-between mt-3 p-2 align-items-center border rounded box-shadow">
     <div>
-        <img class="rounded-circle" style="height: 48px" src="{% static 'SharixAdmin/img/user_avatar_1.png' %}"/>
+        <img class="rounded-circle" style="height: 48px" src="{% static 'sharix_admin/img/user_avatar_1.png' %}"/>
         <span class="mx-2">{{ phone }}</span>
     </div>
     <div>
@@ -215,7 +215,7 @@
   </footer>
 </div>
 
-<script src="{% static 'SharixAdmin/js/menu-bar.js' %}"></script>
+<script src="{% static 'sharix_admin/js/menu-bar.js' %}"></script>
 
 <script>
   // Запуск некоторых функций после загрузки страницы

SharixAdmin/templates/SharixAdmin/main.html → sharix_admin/templates/sharix_admin/main.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/partner.html → sharix_admin/templates/sharix_admin/partner.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 {% load static %}
 
@@ -28,7 +28,7 @@
         </ul>
     </div>
     <a class="btn btn-primary btn-edit" href="{% url "partner_edit" %}">
-        <img src="{% static 'SharixAdmin/img/pencil.svg' %}">
+        <img src="{% static 'sharix_admin/img/pencil.svg' %}">
     </a>
 </div>
 

SharixAdmin/templates/SharixAdmin/partner/doc.html → sharix_admin/templates/sharix_admin/partner/doc.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 {% load static %}
 

SharixAdmin/templates/SharixAdmin/partner/doc_upload.html → sharix_admin/templates/sharix_admin/partner/doc_upload.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 {% load static %}
 

SharixAdmin/templates/SharixAdmin/partner_edit.html → sharix_admin/templates/sharix_admin/partner_edit.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 {% load static %}
 
@@ -13,7 +13,7 @@
 
 <form method="post" class="d-flex flex-column align-items-end">
     {% csrf_token %}
-    {% include 'SharixAdmin/include/form.html' %}
+    {% include 'sharix_admin/include/form.html' %}
     <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#partner-edit-modal">Отправить</button>
 
     <!-- Окно подтверждения -->

SharixAdmin/templates/SharixAdmin/partner_information_form.html → sharix_admin/templates/sharix_admin/partner_information_form.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/partners.html → sharix_admin/templates/sharix_admin/partners.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load render_table from django_tables2 %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/payment.html → sharix_admin/templates/sharix_admin/payment.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/payment_form.html → sharix_admin/templates/sharix_admin/payment_form.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/provider.html → sharix_admin/templates/sharix_admin/provider.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load render_table from django_tables2 %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/resource.html → sharix_admin/templates/sharix_admin/resource.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load render_table from django_tables2 %}
 
 {% block contenthome %}

sharix_admin/templates/sharix_admin/schema.html

@@ -0,0 +1,10 @@
+{% extends 'sharix_admin/base.html' %}
+{% load static %}
+
+{% block content %}
+    
+     <div class="container-fluid" style="width: 100%;" >
+        <img src="{% static 'sharix_admin/img/schemav3.png' %}" /> 
+    </div> 
+    
+{% endblock content %}

SharixAdmin/templates/SharixAdmin/service.html → sharix_admin/templates/sharix_admin/service.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load render_table from django_tables2 %}
 
 

SharixAdmin/templates/SharixAdmin/service_information_form.html → sharix_admin/templates/sharix_admin/service_information_form.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/service_tariff.html → sharix_admin/templates/sharix_admin/service_tariff.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
 

SharixAdmin/templates/SharixAdmin/service_tariff_form.html → sharix_admin/templates/sharix_admin/service_tariff_form.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/service_type.html → sharix_admin/templates/sharix_admin/service_type.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
 {% load static %}

SharixAdmin/templates/SharixAdmin/service_type_delete.html → sharix_admin/templates/sharix_admin/service_type_delete.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/service_type_form.html → sharix_admin/templates/sharix_admin/service_type_form.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 
 {% block contenthome %}

SharixAdmin/templates/SharixAdmin/trans_carried.html → sharix_admin/templates/sharix_admin/trans_carried.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% load i18n %}
 
 {% block contenthome %}