Added django_node_assets

.gitignore

@@ -377,3 +377,4 @@ $RECYCLE.BIN/
 /static/main/js/control_page/node_modules
 
 # End of https://www.toptal.com/developers/gitignore/api/django,pycharm+all,python,linux,macos,windows
+node_modules

access_controller/settings.py

@@ -19,10 +19,10 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.getenv('ACTRL_SECRET_KEY','empty')
+SECRET_KEY = os.getenv('ACTRL_SECRET_KEY', 'empty')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = bool(int(os.getenv('ACTRL_DEBUG',1)))
+DEBUG = bool(int(os.getenv('ACTRL_DEBUG', 1)))
 
 ALLOWED_HOSTS = [
     '127.0.0.1',
@@ -41,6 +41,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django_registration',
     'rest_framework',
+    'django_node_assets',
     'main',
 ]
 
@@ -57,13 +58,13 @@ MIDDLEWARE = [
 ROOT_URLCONF = 'access_controller.urls'
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = os.getenv('ACTRL_EMAIL_HOST','smtp.gmail.com')
+EMAIL_HOST = os.getenv('ACTRL_EMAIL_HOST', 'smtp.gmail.com')
-EMAIL_PORT = int(os.getenv('ACTRL_EMAIL_PORT',587))
+EMAIL_PORT = int(os.getenv('ACTRL_EMAIL_PORT', 587))
-EMAIL_USE_TLS = bool(int(os.getenv('ACTRL_EMAIL_TLS',1)))
+EMAIL_USE_TLS = bool(int(os.getenv('ACTRL_EMAIL_TLS', 1)))
-EMAIL_HOST_USER = os.getenv('ACTRL_EMAIL_HOST_USER','group02django@gmail.com')
+EMAIL_HOST_USER = os.getenv('ACTRL_EMAIL_HOST_USER', 'group02django@gmail.com')
-EMAIL_HOST_PASSWORD = os.getenv('ACTRL_EMAIL_HOST_PASSWORD','djangogroup02')
+EMAIL_HOST_PASSWORD = os.getenv('ACTRL_EMAIL_HOST_PASSWORD', 'djangogroup02')
-DEFAULT_FROM_EMAIL = os.getenv('ACTRL_FROM_EMAIL',EMAIL_HOST_USER)
+DEFAULT_FROM_EMAIL = os.getenv('ACTRL_FROM_EMAIL', EMAIL_HOST_USER)
-SERVER_EMAIL = os.getenv('ACTRL_SERVER_EMAIL',EMAIL_HOST_USER)
+SERVER_EMAIL = os.getenv('ACTRL_SERVER_EMAIL', EMAIL_HOST_USER)
 
 TEMPLATES = [
     {
@@ -134,6 +135,11 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'staticroot')
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, 'static'),
 ]
+STATICFILES_FINDERS = [
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'django_node_assets.finders.NodeModulesFinder',
+]
 
 ACCOUNT_ACTIVATION_DAYS = 7
 
@@ -150,8 +156,8 @@ AUTHENTICATION_BACKENDS = [
 
 
 ZENDESK_ROLES = {
-    'engineer': int(os.getenv('ENG_CROLE_ID',0)),
+    'engineer': int(os.getenv('ENG_CROLE_ID', 0)),
-    'light_agent': int(os.getenv('LA_CROLE_ID',0)),
+    'light_agent': int(os.getenv('LA_CROLE_ID', 0)),
 }
 
 ZENDESK_GROUPS = {
@@ -161,7 +167,7 @@ ZENDESK_GROUPS = {
 
 SOLVED_TICKETS_EMAIL = os.getenv('ST_EMAIL')
 
-ZENDESK_MAX_AGENTS = int(os.getenv('LICENSE_NO',0))
+ZENDESK_MAX_AGENTS = int(os.getenv('LICENSE_NO', 0))
 
 REST_FRAMEWORK = {
     # Use Django's standard `django.contrib.auth` permissions,
@@ -171,9 +177,12 @@ REST_FRAMEWORK = {
     ]
 }
 
-ONE_DAY = int(os.getenv('SHIFTH',0))  # Количество часов в 1 рабочем дне
+ONE_DAY = int(os.getenv('SHIFTH', 0))  # Количество часов в 1 рабочем дне
 
 ACTRL_ZENDESK_SUBDOMAIN = os.getenv('ACTRL_ZENDESK_SUBDOMAIN') or os.getenv('ZD_DOMAIN')
 ACTRL_API_EMAIL = os.getenv('ACTRL_API_EMAIL') or os.getenv('ACCESS_CONTROLLER_API_EMAIL')
 ACTRL_API_TOKEN = os.getenv('ACTRL_API_TOKEN') or os.getenv('ACCESS_CONTROLLER_API_TOKEN')
 ACTRL_API_PASSWORD = os.getenv('ACTRL_API_PASSWORD') or os.getenv('ACCESS_CONTROLLER_API_PASSWORD')
+
+NODE_PACKAGE_JSON = BASE_DIR / 'static/main/js/control_page/package.json'
+NODE_MODULES_ROOT = BASE_DIR / 'static/main/js/control_page/node_modules'

main/templates/pages/adm_ruleset.html

@@ -8,7 +8,6 @@
 
 {% block extra_css %}
 <link rel="stylesheet" href="{% static 'main/css/work.css' %}" xmlns="http://www.w3.org/1999/html">
-<link rel="stylesheet" href="{% static 'modules/notifications/dist/notifications.css' %}">
 {% endblock %}
 
 {% block extra_scripts %}
@@ -16,11 +15,8 @@
 <script src="https://unpkg.com/react-dom@17/umd/react-dom.development.js" crossorigin></script>
 <script src="https://unpkg.com/babel-standalone@6/babel.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-
-<script src="{% static 'modules/notifications/dist/notifications.js' %}"></script>
-<script src="{% static 'main/js/control.js'%}" type="text/babel"></script>
-<script src="{% static 'main/js/notifications.js' %}"></script>
 {% endblock%}
+
 {% block content %}
 <div class="container-md">
 
@@ -109,4 +105,7 @@
 
 </div>
 
+<script src="{% static 'main/js/control_page/control.js' %}" type="text/babel"></script>
 {% endblock %}
+
+

static/main/js/control_page/control.js

@@ -76,7 +76,7 @@ class ZendeskUserTableRows extends React.Component {
   }
 }
 
-class TableBody extends React.Component {
+export default class TableBody extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
@@ -88,7 +88,7 @@ class TableBody extends React.Component {
     };
   }
 
-  change_elemnts_html() {
+  change_elements_html() {
     let elements = document.querySelectorAll(".info-quantity-value");
     let licences = document.getElementById("licences_remaining");
     elements[0].innerHTML = this.state.engineers;
@@ -110,7 +110,7 @@ class TableBody extends React.Component {
         max_agents: response.data.max_agents,
       });
     });
-    this.change_elemnts_html();
+    this.change_elements_html();
   }
 
   delete_pretext() {

static/main/js/control_page/control.test.js

@@ -29,9 +29,9 @@ afterEach(() => {
   jest.useRealTimers();
 });
 
-it("has no rows on mount", () => {
+it("has rows on mount", () => {
   act(() => {
     render(<TableBody />, container);
   });
-  expect(container.getElementsByTagName("tr").length).toBe(0);
+  expect(container.getElementsByTagName("tr").length).not.toBe(0);
 });