Removed js modules files from static

README.md

@@ -46,7 +46,7 @@ cp .env.example .env
 Установить модули для работы js
 ```bash
 sudo apt install npm
-cd static/main/js/control_page
+cd main/control_page_js_modules/
 npm install
 sudo npm -g install npx
 npx webpack
@@ -75,7 +75,7 @@ sudo apt install npm
 ```
 2. Перейти в static папку со страницей управления:
 ```bash
-cd static/main/js/control_page
+cd main/control_page_js_modules/
 ```
 3. Выполнить установку модулей для js
 ```bash

access_controller/settings.py

@@ -186,5 +186,5 @@ ACTRL_API_EMAIL = os.getenv('ACTRL_API_EMAIL') or os.getenv('ACCESS_CONTROLLER_A
 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_PACKAGE_JSON = BASE_DIR / 'static/main/js/control_page_js_modules/package.json'
-NODE_MODULES_ROOT = BASE_DIR / 'static/main/js/control_page/node_modules'
+NODE_MODULES_ROOT = BASE_DIR / 'static/main/js/control_page_js_modules/node_modules'

main/control_page_js_modules/package-lock.json

@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "control_page",
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {

main/control_page_js_modules/package.json

@@ -2,7 +2,7 @@
   "name": "control_page",
   "version": "1.0.0",
   "description": "",
-  "main": "dist/index_bundle.js",
+  "main": "../static/main/js/control_page/dist/index_bundle.js",
   "scripts": {
     "test": "jest"
   },

main/control_page_js_modules/src/control.js

@@ -1,6 +1,5 @@
-import React, {useState} from "react";
+import React from "react";
 import axios from "axios";
-import * as ReactDOM from "react-dom";
 
 function FreeWorkplaces(props) {
   return (

main/control_page_js_modules/src/index.js

@@ -0,0 +1,17 @@
+import {Table} from "./control"
+import ReactDOM from "react-dom";
+import React from "react";
+
+
+function headCheckbox() {
+  let headCheckbox = document.getElementById("head-checkbox");
+  headCheckbox.addEventListener("click", () => {
+    let checkboxes = document.getElementsByName("users");
+    for (let checkbox of checkboxes)
+      checkbox.checked = headCheckbox.checked;
+  });
+}
+
+
+ReactDOM.render(<Table />, document.getElementById("table"));
+headCheckbox();

main/control_page_js_modules/webpack.config.js

@@ -24,8 +24,8 @@ module.exports = {
     ]
   },
   output: {
-    path: path.resolve(__dirname, 'dist'),
+    path: path.resolve('../../static/main/js/control_page', 'dist'),
     filename: 'index_bundle.js'
   },
-  mode: 'development'
+  mode: 'development',
 }

main/tests.py

@@ -534,7 +534,7 @@ class LoggingTestCase(UsersBaseTestCase):
 
 
 class ControlAccessTests(TestCase):
-    fixtures = ['test_data_base.json']
+    fixtures = ['fixtures/data.json']
 
     def setUp(self) -> None:
         self.User = get_user_model()

static/main/js/control_page/src/index.js

@@ -1,16 +0,0 @@
-import {Table} from "./control"
-import ReactDOM from "react-dom";
-import React from "react";
-
-
-function head_checkbox() {
-  let head_checkbox = document.getElementById("head-checkbox");
-  head_checkbox.addEventListener("click", () => {
-    let checkboxes = document.getElementsByName("users");
-    for (let checkbox of checkboxes) checkbox.click();
-  });
-}
-
-
-ReactDOM.render(<Table />, document.getElementById("table"));
-head_checkbox();