changes in templates

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="/home/max/sharix-guide-webapp-base/venv/bin/python" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/sharix-guide-webapp-base.iml" filepath="$PROJECT_DIR$/.idea/sharix-guide-webapp-base.iml" />
+    </modules>
+  </component>
+</project>

.idea/sharix-guide-webapp-base.iml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="$MODULE_DIR$" />
+        <option name="settingsModule" value="core/settings.py" />
+        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
+        <option name="doNotUseTestRunner" value="false" />
+        <option name="trackFilePattern" value="migrations" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/webservice_running/templates" />
+      </list>
+    </option>
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="py.test" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

SharixAdmin/templates/SharixAdmin/account.html

@@ -23,7 +23,7 @@
                   {% blocktrans trimmed with request.user.id as id %}
                   <td class="p-3">{{ id }}</td>                  
                   {% endblocktrans %}
-                  <td class="p-3"><img class="mb-4" style="height: 45px; border-radius: 50%;" src="{{ user.avatar.url }}" alt="Аватар" ></td>                 
+                  <td class="p-3"><img class="mb-4" style="height: 45px; border-radius: 50%;" src="{{user.avatar.url}}" alt="Аватар" ></td>
                   {% blocktrans trimmed with request.user.username as user %}
                   <td class="p-3">{{ user }}</td>                  
                   {% endblocktrans %}

SharixAdmin/templates/SharixAdmin/index.html

@@ -323,7 +323,7 @@
       {% block contenthome %}{% endblock contenthome%}
   </div>
 
-  <footer class="d-flex justify-content-between mt-3 p-2 align-items-center border rounded box-shadow">
+    <footer class="d-flex justify-content-between mt-3 p-2 align-items-center border rounded box-shadow navbar-fixed-bottom">
     <div>
         <img class="rounded-circle" style="height: 48px" src="{% static 'SharixAdmin/img/user_avatar_1.png' %}"/>
         <span class="mx-2">{{ phone }}</span>

SharixAdmin/templates/SharixAdmin/partners.html

@@ -35,5 +35,6 @@
         }
       });
     });
-  </script> 
+  </script>
+</div>>
 {% endblock contenthome %}

SharixAdmin/templates/SharixAdmin/transactions.html

@@ -14,13 +14,12 @@
       <p class="description_service">Полная информация обо всех заказах пользователей. Пользователи могут просматривать детали своих прошлых заказов, 
       включая выбранные услуги, стоимость, дату и время заказа.</p>
       {%endif%}
-  <h3 >{% trans 'User: ' %}{{ request.user.username }}</h3>
-  <h3 >{% blocktrans %}Balance: {{ wallet.balance }} points{% endblocktrans %}</h3>
   <form class="d-flex" method="post">
       {% csrf_token %}
       <input class="form-control me-2" name="search" type="search" placeholder="{% trans 'Search' %}" aria-label="Search">
       <button class="btn btn-outline-success" type="submit">{% trans 'Search' %}</button>
     </form>
     {% comment %} {% render_table  table %} {% endcomment %}
-{% endblock contenthome %} 
+</div>
+{% endblock contenthome %}
 

SharixAdmin/views/cooperate.py

@@ -16,7 +16,7 @@ class CooperateView(UserPassesTestMixin, FormView):
     template_name = "SharixAdmin/cooperate.html"
     success_url = reverse_lazy("home")
 
-    # Проверяем не состояит ли текущий пользователь в группе PARTNER-ADMIN
+    # Проверяем не состоит ли текущий пользователь в группе PARTNER-ADMIN
     def test_func(self):
         return not self.request.user.groups.filter(name='PARTNER-ADMIN').exists()
 

SharixAdmin/views/transactions.py

@@ -5,6 +5,6 @@ from .base import BaseView
 
 
 class TransactionsView(BaseView, TemplateView):
-    page_title = _('Payment history')
+    page_title = _('История заказов')
     page_name = 'transactions'
     template_name = 'SharixAdmin/transactions.html'

core/urls.py

@@ -22,5 +22,4 @@ urlpatterns = [
 if settings.DEBUG:
    urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-   
    urlpatterns.append(path("__debug__/", include("debug_toolbar.urls")))