2.4.5

Reviewed-on: https://git.inno-js.ru/bro-js/journal.pl/pulls/26

ijl.config.js

@@ -1,22 +1,31 @@
 const pkg = require('./package')
 
 module.exports = {
-    apiPath: 'stubs/api',
+  apiPath: 'stubs/api',
-    webpackConfig: {
+  webpackConfig: {
-        output: {
+    output: {
-            publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`
+      publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
-        }
     },
-    navigations: {
+  },
-        'journal.main': '/journal.pl'
+  navigations: {
+    'journal.main': '/journal.pl',
+  },
+  features: {
+    journal: {
+      'lesson.bar': {
+        on: true,
+        value: '',
+        key: 'lesson.bar',
+      },
+      'group.by.date': {
+        on: true,
+        value: '',
+        key: 'group.by.date',
+      },
     },
-    features: {
+  },
-        'journal': {
+  config: {
-            // add your features here in the format [featureName]: { value: string }
+    'journal.back.url': '/api',
-        },
+    'journal.polling-interval': '10000',
-    },
+  },
-    config: {
-    "journal.back.url": "/api",
-    "journal.polling-interval": "10000"
-  }
 }

package-lock.json

@@ -1,18 +1,19 @@
 {
     "name": "journal.pl",
-    "version": "2.0.0",
+    "version": "2.4.5",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "journal.pl",
-            "version": "2.0.0",
+            "version": "2.4.5",
             "license": "MIT",
             "dependencies": {
                 "@chakra-ui/icons": "^2.1.1",
                 "@chakra-ui/react": "^2.8.2",
                 "@emotion/react": "^11.11.4",
                 "@emotion/styled": "^11.11.0",
+                "@nivo/bar": "^0.85.1",
                 "@reduxjs/toolkit": "^2.2.1",
                 "@types/react": "^18.2.60",
                 "@types/react-dom": "^18.2.19",
@@ -3617,6 +3618,172 @@
                 "@jridgewell/sourcemap-codec": "1.4.14"
             }
         },
+        "node_modules/@nivo/annotations": {
+            "version": "0.85.1",
+            "resolved": "https://registry.npmjs.org/@nivo/annotations/-/annotations-0.85.1.tgz",
+            "integrity": "sha512-+YVFKMokf6MMXsztpEoOoFwG+XcEJV90xezuqJ8FmS0hgEzJ8xTeWNxPRWfrvxndMXNrau4QIRU5GrumBmiy4Q==",
+            "dependencies": {
+                "@nivo/colors": "0.85.1",
+                "@nivo/core": "0.85.1",
+                "@react-spring/web": "9.4.5 || ^9.7.2",
+                "@types/prop-types": "^15.7.2",
+                "lodash": "^4.17.21",
+                "prop-types": "^15.7.2"
+            },
+            "peerDependencies": {
+                "react": ">= 16.14.0 < 19.0.0"
+            }
+        },
+        "node_modules/@nivo/axes": {
+            "version": "0.85.1",
+            "resolved": "https://registry.npmjs.org/@nivo/axes/-/axes-0.85.1.tgz",
+            "integrity": "sha512-qhqyamgH8CAdOGEiLwwnqMpPKN6bv9FmKr/75UrNcAvWbU0PZ3unZJGKNkuFzlVAI9/RVvOUvXEE0rRBqV93qg==",
+            "dependencies": {
+                "@nivo/core": "0.85.1",
+                "@nivo/scales": "0.85.1",
+                "@react-spring/web": "9.4.5 || ^9.7.2",
+                "@types/d3-format": "^1.4.1",
+                "@types/d3-time-format": "^2.3.1",
+                "@types/prop-types": "^15.7.2",
+                "d3-format": "^1.4.4",
+                "d3-time-format": "^3.0.0",
+                "prop-types": "^15.7.2"
+            },
+            "peerDependencies": {
+                "react": ">= 16.14.0 < 19.0.0"
+            }
+        },
+        "node_modules/@nivo/bar": {
+            "version": "0.85.1",
+            "resolved": "https://registry.npmjs.org/@nivo/bar/-/bar-0.85.1.tgz",
+            "integrity": "sha512-42Hjvt5YJ9O5Ew+SrZ+jd8NR30odSRuHS/B4tpsL/Yqg2MjmpB+niRMuybEhUAuhQ0aCKvwUHlocjwRRzNXqnA==",
+            "dependencies": {
+                "@nivo/annotations": "0.85.1",
+                "@nivo/axes": "0.85.1",
+                "@nivo/colors": "0.85.1",
+                "@nivo/core": "0.85.1",
+                "@nivo/legends": "0.85.1",
+                "@nivo/scales": "0.85.1",
+                "@nivo/tooltip": "0.85.1",
+                "@react-spring/web": "9.4.5 || ^9.7.2",
+                "@types/d3-scale": "^4.0.8",
+                "@types/d3-shape": "^2.0.0",
+                "d3-scale": "^4.0.2",
+                "d3-shape": "^1.3.5",
+                "lodash": "^4.17.21"
+            },
+            "peerDependencies": {
+                "react": ">= 16.14.0 < 19.0.0"
+            }
+        },
+        "node_modules/@nivo/colors": {
+            "version": "0.85.1",
+            "resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.85.1.tgz",
+            "integrity": "sha512-61qG98cfyku0fTJTdtCTS3zBQKt88URh4FAvlQIoifvKg0607S2Gz5l7P9KJfN7xEK5tmE4bRaOMmjc4AZS2Kg==",
+            "dependencies": {
+                "@nivo/core": "0.85.1",
+                "@types/d3-color": "^3.0.0",
+                "@types/d3-scale": "^4.0.8",
+                "@types/d3-scale-chromatic": "^3.0.0",
+                "@types/prop-types": "^15.7.2",
+                "d3-color": "^3.1.0",
+                "d3-scale": "^4.0.2",
+                "d3-scale-chromatic": "^3.0.0",
+                "lodash": "^4.17.21",
+                "prop-types": "^15.7.2"
+            },
+            "peerDependencies": {
+                "react": ">= 16.14.0 < 19.0.0"
+            }
+        },
+        "node_modules/@nivo/core": {
+            "version": "0.85.1",
+            "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.85.1.tgz",
+            "integrity": "sha512-366bc4hBicsitcinQyKGfUPpifk5W60RAjwZ4sQkY8R6OzwPMgY+eu/sfPZTNcY7rsleGg8whX0A2dBg2czWMA==",
+            "dependencies": {
+                "@nivo/recompose": "0.85.0",
+                "@nivo/tooltip": "0.85.1",
+                "@react-spring/web": "9.4.5 || ^9.7.2",
+                "@types/d3-shape": "^2.0.0",
+                "d3-color": "^3.1.0",
+                "d3-format": "^1.4.4",
+                "d3-interpolate": "^3.0.1",
+                "d3-scale": "^4.0.2",
+                "d3-scale-chromatic": "^3.0.0",
+                "d3-shape": "^1.3.5",
+                "d3-time-format": "^3.0.0",
+                "lodash": "^4.17.21",
+                "prop-types": "^15.7.2"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/nivo/donate"
+            },
+            "peerDependencies": {
+                "react": ">= 16.14.0 < 19.0.0"
+            }
+        },
+        "node_modules/@nivo/legends": {
+            "version": "0.85.1",
+            "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.85.1.tgz",
+            "integrity": "sha512-v2DRiUieo3/iV1Fft3i9pbGTkE5arXzmw+p1ptb4xfBBPpd0hSAHvaePXDY370G31dsh2v5LouL97u+q12li4Q==",
+            "dependencies": {
+                "@nivo/colors": "0.85.1",
+                "@nivo/core": "0.85.1",
+                "@types/d3-scale": "^4.0.8",
+                "@types/prop-types": "^15.7.2",
+                "d3-scale": "^4.0.2",
+                "prop-types": "^15.7.2"
+            },
+            "peerDependencies": {
+                "react": ">= 16.14.0 < 19.0.0"
+            }
+        },
+        "node_modules/@nivo/recompose": {
+            "version": "0.85.0",
+            "resolved": "https://registry.npmjs.org/@nivo/recompose/-/recompose-0.85.0.tgz",
+            "integrity": "sha512-UptKwVJ9mlGQKn4a/JiORWbZgo6hT+qEpKBKIs9BUHRIW0a4T0BIE2PA+uDMPpNxzNFgOCu/y8iM5Rhs6QmrmA==",
+            "dependencies": {
+                "@types/prop-types": "^15.7.2",
+                "@types/react-lifecycles-compat": "^3.0.1",
+                "prop-types": "^15.7.2",
+                "react-lifecycles-compat": "^3.0.4"
+            },
+            "peerDependencies": {
+                "react": ">= 16.14.0 < 19.0.0"
+            }
+        },
+        "node_modules/@nivo/scales": {
+            "version": "0.85.1",
+            "resolved": "https://registry.npmjs.org/@nivo/scales/-/scales-0.85.1.tgz",
+            "integrity": "sha512-zObimCMjbbioMpQtVSGmr52OTn+BVJZsyhKHFx7CK57RA+OW/9lGnvqzc0rnFxl8WBqvHk7wReE5UI8xva/6Zw==",
+            "dependencies": {
+                "@types/d3-scale": "^4.0.8",
+                "@types/d3-time": "^1.1.1",
+                "@types/d3-time-format": "^3.0.0",
+                "d3-scale": "^4.0.2",
+                "d3-time": "^1.0.11",
+                "d3-time-format": "^3.0.0",
+                "lodash": "^4.17.21"
+            }
+        },
+        "node_modules/@nivo/scales/node_modules/@types/d3-time-format": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-3.0.4.tgz",
+            "integrity": "sha512-or9DiDnYI1h38J9hxKEsw513+KVuFbEVhl7qdxcaudoiqWWepapUen+2vAriFGexr6W5+P4l9+HJrB39GG+oRg=="
+        },
+        "node_modules/@nivo/tooltip": {
+            "version": "0.85.1",
+            "resolved": "https://registry.npmjs.org/@nivo/tooltip/-/tooltip-0.85.1.tgz",
+            "integrity": "sha512-lX0/MuDI9HvGzYxAtE3mnriYEgFHBWf7d5BMqUifJZIyg82XkI9g3z6vwAwPKRJ52rON9Yhik42+gwFMFj3BrA==",
+            "dependencies": {
+                "@nivo/core": "0.85.1",
+                "@react-spring/web": "9.4.5 || ^9.7.2"
+            },
+            "peerDependencies": {
+                "react": ">= 16.14.0 < 19.0.0"
+            }
+        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3661,6 +3828,66 @@
                 "url": "https://opencollective.com/popperjs"
             }
         },
+        "node_modules/@react-spring/animated": {
+            "version": "9.7.3",
+            "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.3.tgz",
+            "integrity": "sha512-5CWeNJt9pNgyvuSzQH+uy2pvTg8Y4/OisoscZIR8/ZNLIOI+CatFBhGZpDGTF/OzdNFsAoGk3wiUYTwoJ0YIvw==",
+            "dependencies": {
+                "@react-spring/shared": "~9.7.3",
+                "@react-spring/types": "~9.7.3"
+            },
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            }
+        },
+        "node_modules/@react-spring/core": {
+            "version": "9.7.3",
+            "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.3.tgz",
+            "integrity": "sha512-IqFdPVf3ZOC1Cx7+M0cXf4odNLxDC+n7IN3MDcVCTIOSBfqEcBebSv+vlY5AhM0zw05PDbjKrNmBpzv/AqpjnQ==",
+            "dependencies": {
+                "@react-spring/animated": "~9.7.3",
+                "@react-spring/shared": "~9.7.3",
+                "@react-spring/types": "~9.7.3"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/react-spring/donate"
+            },
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            }
+        },
+        "node_modules/@react-spring/shared": {
+            "version": "9.7.3",
+            "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.3.tgz",
+            "integrity": "sha512-NEopD+9S5xYyQ0pGtioacLhL2luflh6HACSSDUZOwLHoxA5eku1UPuqcJqjwSD6luKjjLfiLOspxo43FUHKKSA==",
+            "dependencies": {
+                "@react-spring/types": "~9.7.3"
+            },
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            }
+        },
+        "node_modules/@react-spring/types": {
+            "version": "9.7.3",
+            "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.3.tgz",
+            "integrity": "sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw=="
+        },
+        "node_modules/@react-spring/web": {
+            "version": "9.7.3",
+            "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz",
+            "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==",
+            "dependencies": {
+                "@react-spring/animated": "~9.7.3",
+                "@react-spring/core": "~9.7.3",
+                "@react-spring/shared": "~9.7.3",
+                "@react-spring/types": "~9.7.3"
+            },
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+                "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            }
+        },
         "node_modules/@reduxjs/toolkit": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.1.tgz",
@@ -3719,6 +3946,52 @@
             "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
             "dev": true
         },
+        "node_modules/@types/d3-color": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+            "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="
+        },
+        "node_modules/@types/d3-format": {
+            "version": "1.4.5",
+            "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-1.4.5.tgz",
+            "integrity": "sha512-mLxrC1MSWupOSncXN/HOlWUAAIffAEBaI4+PKy2uMPsKe4FNZlk7qrbTjmzJXITQQqBHivaks4Td18azgqnotA=="
+        },
+        "node_modules/@types/d3-path": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-2.0.4.tgz",
+            "integrity": "sha512-jjZVLBjEX4q6xneKMmv62UocaFJFOTQSb/1aTzs3m3ICTOFoVaqGBHpNLm/4dVi0/FTltfBKgmOK1ECj3/gGjA=="
+        },
+        "node_modules/@types/d3-scale": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
+            "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
+            "dependencies": {
+                "@types/d3-time": "*"
+            }
+        },
+        "node_modules/@types/d3-scale-chromatic": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz",
+            "integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw=="
+        },
+        "node_modules/@types/d3-shape": {
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-2.1.7.tgz",
+            "integrity": "sha512-HedHlfGHdwzKqX9+PiQVXZrdmGlwo7naoefJP7kCNk4Y7qcpQt1tUaoRa6qn0kbTdlaIHGO7111qLtb/6J8uuw==",
+            "dependencies": {
+                "@types/d3-path": "^2"
+            }
+        },
+        "node_modules/@types/d3-time": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-1.1.4.tgz",
+            "integrity": "sha512-JIvy2HjRInE+TXOmIGN5LCmeO0hkFZx5f9FZ7kiN+D+YTcc8pptsiLiuHsvwxwC7VVKmJ2ExHUgNlAiV7vQM9g=="
+        },
+        "node_modules/@types/d3-time-format": {
+            "version": "2.3.4",
+            "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-2.3.4.tgz",
+            "integrity": "sha512-xdDXbpVO74EvadI3UDxjxTdR6QIxm1FKzEA/+F8tL4GWWUg/hgvBqf6chql64U5A9ZUGWo7pEu4eNlyLwbKdhg=="
+        },
         "node_modules/@types/eslint": {
             "version": "8.4.10",
             "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz",
@@ -3814,6 +4087,14 @@
                 "@types/react": "*"
             }
         },
+        "node_modules/@types/react-lifecycles-compat": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@types/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+            "integrity": "sha512-1CM48Y9ztL5S4wjt7DK2izrkgPp/Ql0zCJu/vHzhgl7J+BD4UbSGjHN1M2TlePms472JvOazUtAO1/G3oFZqIQ==",
+            "dependencies": {
+                "@types/react": "*"
+            }
+        },
         "node_modules/@types/scheduler": {
             "version": "0.16.2",
             "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
@@ -5619,6 +5900,105 @@
             "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
             "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
         },
+        "node_modules/d3-array": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+            "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+            "dependencies": {
+                "internmap": "1 - 2"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/d3-color": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+            "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/d3-format": {
+            "version": "1.4.5",
+            "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
+            "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
+        },
+        "node_modules/d3-interpolate": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+            "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+            "dependencies": {
+                "d3-color": "1 - 3"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/d3-path": {
+            "version": "1.0.9",
+            "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
+            "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
+        },
+        "node_modules/d3-scale": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+            "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+            "dependencies": {
+                "d3-array": "2.10.0 - 3",
+                "d3-format": "1 - 3",
+                "d3-interpolate": "1.2.0 - 3",
+                "d3-time": "2.1.1 - 3",
+                "d3-time-format": "2 - 4"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/d3-scale-chromatic": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+            "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+            "dependencies": {
+                "d3-color": "1 - 3",
+                "d3-interpolate": "1 - 3"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/d3-scale/node_modules/d3-time": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+            "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+            "dependencies": {
+                "d3-array": "2 - 3"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/d3-shape": {
+            "version": "1.3.7",
+            "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
+            "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+            "dependencies": {
+                "d3-path": "1"
+            }
+        },
+        "node_modules/d3-time": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
+            "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
+        },
+        "node_modules/d3-time-format": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
+            "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
+            "dependencies": {
+                "d3-time": "1 - 2"
+            }
+        },
         "node_modules/data-view-buffer": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
@@ -8141,6 +8521,14 @@
                 "node": ">= 0.4"
             }
         },
+        "node_modules/internmap": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+            "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/interpret": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
@@ -8914,6 +9302,11 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+        },
         "node_modules/lodash.debounce": {
             "version": "4.0.8",
             "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -10432,8 +10825,7 @@
         "node_modules/react-lifecycles-compat": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-            "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==",
+            "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
-            "dev": true
         },
         "node_modules/react-redux": {
             "version": "9.1.0",

package.json

@@ -1,10 +1,10 @@
 {
     "name": "journal.pl",
-    "version": "2.0.0",
+    "version": "2.4.5",
     "description": "inno-js platform journal ui repo",
     "main": "./src/index.tsx",
     "scripts": {
-        "start": "start chrome http://ift-b1.kc.inno-js.test/journal.pl && ijl-cli server --port=80",
+        "start": "start chrome http://ift-b1.kc.inno-js.test/journal.pl & ijl-cli server --port=80",
         "build": "npm run clean && ijl-cli build --dev",
         "build:prod": "npm run clean && ijl-cli build",
         "clean": "rimraf dist",
@@ -30,6 +30,7 @@
         "@chakra-ui/react": "^2.8.2",
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.0",
+        "@nivo/bar": "^0.85.1",
         "@reduxjs/toolkit": "^2.2.1",
         "@types/react": "^18.2.60",
         "@types/react-dom": "^18.2.19",

src/__data__/api/api.ts

@@ -78,6 +78,14 @@ export const api = createApi({
       }),
       invalidatesTags: ['LessonList'],
     }),
+    updateLesson: builder.mutation<BaseResponse<Lesson>, Partial<Lesson> & Pick<Lesson, '_id'>>({
+      query: (data) => ({
+        method: 'PUT',
+        url: '/lesson',
+        body: data,
+      }),
+      invalidatesTags: ['LessonList'],
+    }),
     deleteLesson: builder.mutation<null, string>({
       query: (lessonId) => ({
         url: `/lesson/${lessonId}`,

src/__data__/kc.ts

@@ -1,8 +1,8 @@
 import Keycloak from 'keycloak-js';
 
 export const keycloak = new Keycloak({
-  url: 'https://kc.inno-js.ru',
+  url: 'https://kc.bro-js.ru',
-  realm: 'inno-js',
+  realm: 'bro-js',
   clientId: 'journal'
 });
 

src/__data__/model.ts

@@ -74,6 +74,7 @@ export interface User {
   given_name: string;
   family_name: string;
   email: string;
+  picture?: string;
 }
 
 export interface Course {

src/app.tsx

@@ -45,7 +45,7 @@ const App = ({ store }) => {
                               /* rgba(255, 255, 255, 0) 65% */
                           );
                           height: 100%;
-                          font-family: KiyosunaSans, Montserrat, RFKrabuler, sans-serif;
+                          /* font-family: KiyosunaSans, Montserrat, RFKrabuler, sans-serif; */
                           font-weight: 600;
                       }
                       #app {

src/components/user-card/index.tsx

@@ -0,0 +1 @@
+export { UserCard } from './user-card'

src/components/user-card/style.ts

@@ -0,0 +1,53 @@
+import styled from '@emotion/styled'
+import { css, keyframes } from '@emotion/react'
+
+export const Avatar = styled.img`
+  width: 96px;
+  height: 96px;
+  margin: 0 auto;
+  border-radius: 6px;
+`
+
+export const Wrapper = styled.div<{ warn?: boolean; width?: string | number }>`
+  list-style: none;
+  background-color: #ffffff;
+  padding: 16px;
+  border-radius: 12px;
+  box-shadow: 2px 2px 6px #0000005c;
+  transition: all 0.5;
+  position: relative;
+  width: 180px;
+  min-height: 190px;
+  max-height: 200px;
+  margin-right: 12px;
+  padding-bottom: 22px;
+  ${({ width }) =>
+    width
+      ? css`
+          width: ${width};
+        `
+      : ''}
+
+  ${(props) =>
+    props.warn
+      ? css`
+          background-color: #000000;
+          opacity: 0.7;
+          color: #e4e4e4;
+        `
+      : ''}
+`
+
+export const AddMissedButton = styled.button`
+  position: absolute;
+  bottom: 8px;
+  right: 12px;
+  border: none;
+  background-color: #00000000;
+  opacity: 0.2;
+
+  :hover {
+    cursor: pointer;
+    opacity: 1;
+  }
+`

src/components/user-card/user-card.tsx

@@ -0,0 +1,47 @@
+import React from 'react'
+import { sha256 } from 'js-sha256'
+
+import { User } from '../../__data__/model'
+
+import { AddMissedButton, Avatar, Wrapper } from './style'
+
+export function getGravatarURL(email, user) {
+  if (!email) return void 0
+  const address = String(email).trim().toLowerCase()
+  const hash = sha256(address)
+
+  return `https://www.gravatar.com/avatar/${hash}?d=robohash`
+}
+
+export const UserCard = ({
+  student,
+  present,
+  onAddUser,
+  wrapperAS,
+  width
+}: {
+  student: User
+  present: boolean
+  width?: string | number
+  onAddUser?: (user: User) => void
+  wrapperAS?: React.ElementType<any, keyof React.JSX.IntrinsicElements>;
+}) => {
+  return (
+    <Wrapper warn={!present} as={wrapperAS} width={width}>
+      <Avatar src={student.picture || getGravatarURL(student.email, null)} />
+      <p style={{ marginTop: 6 }}>
+        {student.name || student.preferred_username}{' '}
+      </p>
+      {onAddUser && !present && (
+        <AddMissedButton onClick={() => onAddUser(student)}>
+          add
+        </AddMissedButton>
+      )}
+    </Wrapper>
+  )
+}
+
+UserCard.defaultProps = {
+  wrapperAS: 'div',
+  onAddUser: void 0,
+}

src/dashboard.tsx

@@ -1,6 +1,8 @@
 import React, { useEffect, Suspense } from 'react'
 import { Routes, Route, useNavigate } from 'react-router-dom'
 import { Provider } from 'react-redux'
+import { getNavigationsValue } from '@ijl/cli'
+import { Box, Container, Spinner, VStack } from '@chakra-ui/react'
 
 import {
   CourseListPage,
@@ -8,20 +10,8 @@ import {
   LessonListPage,
   UserPage,
 } from './pages'
-import { getNavigationsValue } from '@ijl/cli'
-import { Box, Container, Spinner, VStack } from '@chakra-ui/react'
 
-const Redirect = ({ path }) => {
+const Wrapper = ({ children }: { children: React.ReactElement }) => (
-  const navigate = useNavigate()
-
-  useEffect(() => {
-    navigate(path)
-  }, [])
-
-  return null
-}
-
-const Wrapper = ({ children }) => (
   <Suspense
     fallback={
       <Container>

src/pages/course-list.tsx

@@ -29,7 +29,7 @@ import {
 } from '@chakra-ui/react'
 import { useForm, Controller } from 'react-hook-form'
 
-import { ErrorSpan, MainWrapper } from './style'
+import { ErrorSpan } from './style'
 
 import { useAppSelector } from '../__data__/store'
 import { api } from '../__data__/api/api'

src/pages/lesson-details.tsx

@@ -2,6 +2,7 @@ import React, { useEffect, useState, useRef, useMemo } from 'react'
 import { useParams, Link } from 'react-router-dom'
 import dayjs from 'dayjs'
 import QRCode from 'qrcode'
+import { sha256 } from 'js-sha256'
 import { getConfigValue, getNavigationsValue } from '@ijl/cli'
 import {
   Box,
@@ -9,32 +10,38 @@ import {
   BreadcrumbItem,
   BreadcrumbLink,
   Container,
-  HStack,
   VStack,
   Heading,
+  Stack,
 } from '@chakra-ui/react'
 
+import { api } from '../__data__/api/api'
+import { User } from '../__data__/model'
+import { UserCard } from '../components/user-card'
+
 import {
   QRCanvas,
-  LessonItem,
+  StudentList,
-  Lessonname,
-  AddMissedButton,
-  UnorderList,
   BreadcrumbsWrapper,
 } from './style'
-import { api } from '../__data__/api/api'
+
-import { User } from '../__data__/model'
+export function getGravatarURL(email, user) {
+  if (!email) return void 0
+  const address = String(email).trim().toLowerCase()
+  const hash = sha256(address)
+
+  // Grab the actual image URL
+  return `https://www.gravatar.com/avatar/${hash}?d=robohash`
+}
 
 const LessonDetail = () => {
   const { lessonId, courseId } = useParams()
   const canvRef = useRef(null)
-  const [lesson, setLesson] = useState(null)
   const {
     isFetching,
-    isLoading,
     data: accessCode,
-    error,
     isSuccess,
+    refetch,
   } = api.useCreateAccessCodeQuery(
     { lessonId },
     {
@@ -49,6 +56,13 @@ const LessonDetail = () => {
     () => `${location.origin}/journal/u/${lessonId}/${accessCode?.body?._id}`,
     [accessCode, lessonId],
   )
+
+  useEffect(() => {
+    if (manualAddRqst.isSuccess) {
+      refetch()
+    }
+  }, [manualAddRqst.isSuccess])
+
   useEffect(() => {
     if (!isFetching && isSuccess) {
       QRCode.toCanvas(
@@ -83,7 +97,7 @@ const LessonDetail = () => {
       }
     }
 
-    return allStudents
+    return allStudents.sort((a, b) => (a.present ? -1 : 1))
   }, [accessCode?.body, AllStudents.data])
 
   return (
@@ -110,7 +124,7 @@ const LessonDetail = () => {
           </BreadcrumbItem>
         </Breadcrumb>
       </BreadcrumbsWrapper>
-      <Container maxW="container.xl" centerContent px="200">
+      <Container maxW="2280px">
         <VStack align="left">
           <Heading as="h3" mt="4" mb="3">
             Тема занятия:
@@ -125,27 +139,22 @@ const LessonDetail = () => {
             человек
           </Box>
         </VStack>
-        <HStack spacing="8">
+        <Stack spacing="8" sx={{ flexDirection: { sm: 'column', md: 'row' } }}>
           <a href={userUrl}>
             <QRCanvas ref={canvRef} />
           </a>
-          <UnorderList>
+          <StudentList>
             {studentsArr.map((student) => (
-              <LessonItem key={student.sub} warn={!student.present}>
+              <UserCard
-                <Lessonname>
+                wrapperAS="li"
-                  {student.name || student.preferred_username}{' '}
+                key={student.sub}
-                  {!student.present && (
+                student={student}
-                    <AddMissedButton
+                present={student.present}
-                      onClick={() => manualAdd({ lessonId, user: student })}
+                onAddUser={(user: User) => manualAdd({ lessonId, user })}
-                    >
+              />
-                      add
-                    </AddMissedButton>
-                  )}
-                </Lessonname>
-              </LessonItem>
             ))}
-          </UnorderList>
+          </StudentList>
-        </HStack>
+        </Stack>
       </Container>
     </>
   )

src/pages/lesson-list.tsx

@@ -1,7 +1,13 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
+import React, {
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
+import { ResponsiveBar } from '@nivo/bar'
 import dayjs from 'dayjs'
 import { Link, useParams } from 'react-router-dom'
-import { getNavigationsValue } from '@ijl/cli'
+import { getNavigationsValue, getFeatures } from '@ijl/cli'
 import { useForm, Controller } from 'react-hook-form'
 import {
   Breadcrumb,
@@ -46,50 +52,189 @@ import {
 } from '@chakra-ui/react'
 import { AddIcon, EditIcon } from '@chakra-ui/icons'
 
-import { ErrorSpan, BreadcrumbsWrapper } from './style'
-
 import { useAppSelector } from '../__data__/store'
 import { api } from '../__data__/api/api'
 import { isTeacher } from '../utils/user'
 import { qrCode } from '../assets'
 import { Lesson } from '../__data__/model'
 
+import { ErrorSpan, BreadcrumbsWrapper } from './style'
+
+const features = getFeatures('journal')
+
+const barFeature = features?.['lesson.bar']
+const groupByDate = features?.['group.by.date']
+
 interface NewLessonForm {
   name: string
   date: string
 }
 
-const LessonList = () => {
+interface LessonFormProps {
-  const { courseId } = useParams()
+  lesson?: Partial<Lesson>
-  const user = useAppSelector((s) => s.user)
+  isLoading: boolean
-  const { data, isLoading, error } = api.useLessonListQuery(courseId)
+  onCancel: () => void
-  const [createLesson, crLQuery] = api.useCreateLessonMutation()
+  onSubmit: (lesson: Lesson) => void
-  const [deleteLesson, deletingRqst] = api.useDeleteLessonMutation()
+  error?: string
-  const [showForm, setShowForm] = useState(false)
+  title: string
-  const [lessonToDelete, setlessonToDelete] = useState<Lesson>(null)
+  nameButton: string
-  const cancelRef = React.useRef()
+}
+
+const LessonForm = ({
+  lesson,
+  isLoading,
+  onCancel,
+  onSubmit,
+  error,
+  title,
+  nameButton,
+}: LessonFormProps) => {
   const {
     control,
     handleSubmit,
     reset,
     formState: { errors },
-    getValues,
   } = useForm<NewLessonForm>({
-    defaultValues: {
+    defaultValues: lesson || {
       name: '',
       date: '',
     },
   })
+
+  return (
+    <Card align="left">
+      <CardHeader display="flex">
+        <Heading as="h2" mt="0">
+          {title}
+        </Heading>
+        <CloseButton
+          ml="auto"
+          onClick={() => {
+            reset()
+            onCancel()
+          }}
+        />
+      </CardHeader>
+      <CardBody>
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <VStack spacing="10" align="left">
+            <Controller
+              control={control}
+              name="date"
+              rules={{ required: 'Обязательное поле' }}
+              render={({ field }) => (
+                <FormControl>
+                  <FormLabel>Дата</FormLabel>
+                  <Input
+                    {...field}
+                    required={false}
+                    placeholder="Укажите дату лекции"
+                    size="md"
+                    type="datetime-local"
+                  />
+                  {errors.date ? (
+                    <FormErrorMessage>{errors.date?.message}</FormErrorMessage>
+                  ) : (
+                    <FormHelperText>Укажите дату и время лекции</FormHelperText>
+                  )}
+                </FormControl>
+              )}
+            />
+
+            <Controller
+              control={control}
+              name="name"
+              rules={{ required: 'Обязательное поле' }}
+              render={({ field }) => (
+                <FormControl isRequired isInvalid={Boolean(errors.name)}>
+                  <FormLabel>Название новой лекции:</FormLabel>
+                  <Input
+                    {...field}
+                    required={false}
+                    placeholder="Название лекции"
+                    size="md"
+                  />
+                  {errors.name && (
+                    <FormErrorMessage>{errors.name.message}</FormErrorMessage>
+                  )}
+                </FormControl>
+              )}
+            />
+            <Box mt="10">
+              <Button
+                size="lg"
+                type="submit"
+                leftIcon={<AddIcon />}
+                colorScheme="blue"
+                isLoading={isLoading}
+              >
+                {nameButton}
+              </Button>
+            </Box>
+          </VStack>
+
+          {error && <ErrorSpan>{error}</ErrorSpan>}
+        </form>
+      </CardBody>
+    </Card>
+  )
+}
+
+const LessonList = () => {
+  const { courseId } = useParams()
+  const user = useAppSelector((s) => s.user)
+  const { data, isLoading, error, isSuccess } = api.useLessonListQuery(courseId)
+  const [createLesson, crLQuery] = api.useCreateLessonMutation()
+  const [deleteLesson, deletingRqst] = api.useDeleteLessonMutation()
+  const [updateLesson, updateLessonRqst] = api.useUpdateLessonMutation()
+  const [showForm, setShowForm] = useState(false)
+  const [lessonToDelete, setlessonToDelete] = useState<Lesson>(null)
+  const cancelRef = React.useRef()
   const toast = useToast()
   const toastRef = useRef(null)
+  const createdLessonRef = useRef(null)
+  const [editLesson, setEditLesson] = useState<Lesson>(null)
+  const sorted = useMemo(() => [...(data?.body || [])]?.sort((a, b) => a.date > b.date ? 1 : -1), [data, data?.body])
 
-  const onSubmit = ({ name, date }) => {
+  const lessonCalc = useMemo(() => {
+    if (!isSuccess) {
+      return []
+    }
+
+
+    if (!groupByDate) {
+      return [{ date: '', data: sorted }]
+    }
+
+    const lessonsData = []
+    for (let i = 0; i < sorted.length; i++) {
+      const element = sorted[i]
+      const find = lessonsData.find(
+        (item) => dayjs(element.date).diff(dayjs(item.date), 'day') === 0,
+      )
+
+      if (find) {
+        find.data.push(element)
+      } else {
+        lessonsData.push({
+          date: element.date,
+          data: [element],
+        })
+      }
+    }
+
+    return lessonsData.sort((a, b) => a.date < b.date? 1 : -1)
+  }, [groupByDate, isSuccess, sorted])
+
+  const onSubmit = (lessonData) => {
     toastRef.current = toast({
       title: 'Отправляем',
       status: 'loading',
       duration: 9000,
     })
-    createLesson({ name, courseId, date })
+    createdLessonRef.current = lessonData
+    if (editLesson) updateLesson(lessonData)
+    else createLesson({ courseId, ...lessonData })
   }
 
   useEffect(() => {
@@ -106,27 +251,27 @@ const LessonList = () => {
       toast({
         status: 'warning',
         duration: 9000,
-        render(props) {
+        render: ({ id, ...toastProps }) => (
-          return (
+          <Toast
-            <Toast
+            {...toastProps}
-              {...props}
+            id={id}
-              title={
+            title={
-                <>
+              <>
-                  <Box pb={3}>
+                <Box pb={3}>
-                    <Text fontSize="xl">{`Удалена лекция ${lesson.name}`}</Text>
+                  <Text fontSize="xl">{`Удалена лекция ${lesson.name}`}</Text>
-                  </Box>
+                </Box>
-                  <Button
+                <Button
-                    onClick={() =>
+                  onClick={() => {
-                      createLesson({ courseId, ...lesson })
+                    createLesson({ courseId, ...lesson })
-                    }
+                    toast.close(id)
-                  >
+                  }}
-                    Восстановить
+                >
-                  </Button>
+                  Восстановить
-                </>
+                </Button>
-              }
+              </>
-            />
+            }
-          )
+          />
-        },
+        ),
       })
       setlessonToDelete(null)
     }
@@ -134,20 +279,34 @@ const LessonList = () => {
 
   useEffect(() => {
     if (crLQuery.isSuccess) {
-      const values = getValues()
+      const toastProps = {
-      if (toastRef.current) {
+        title: 'Лекция создана',
-        toast.update(toastRef.current, {
+        description: `Лекция ${createdLessonRef.current.name} успешно создана`,
-          title: 'Лекция создана',
+        status: 'success' as 'success',
-          description: `Лекция ${values.name} успешно создана`,
+        duration: 9000,
-          status: 'success',
+        isClosable: true,
-          duration: 9000,
-          isClosable: true,
-        })
       }
-      reset()
+      if (toastRef.current) toast.update(toastRef.current, toastProps)
+      else toast(toastProps)
+      setShowForm(false)
     }
   }, [crLQuery.isSuccess])
 
+  useEffect(() => {
+    if (updateLessonRqst.isSuccess) {
+      const toastProps = {
+        title: 'Лекция Обновлена',
+        description: `Лекция ${createdLessonRef.current.name} успешно обновлена`,
+        status: 'success' as 'success',
+        duration: 9000,
+        isClosable: true,
+      }
+      if (toastRef.current) toast.update(toastRef.current, toastProps)
+      else toast(toastProps)
+      setShowForm(false)
+    }
+  }, [updateLessonRqst.isSuccess])
+
   if (isLoading) {
     return (
       <Container maxW="container.xl">
@@ -216,89 +375,23 @@ const LessonList = () => {
           </BreadcrumbItem>
         </Breadcrumb>
       </BreadcrumbsWrapper>
-      <Container maxW="container.xl">
+      <Container maxW="container.xl" position="relative">
         {isTeacher(user) && (
           <Box mt="15" mb="15">
             {showForm ? (
-              <Card align="left">
+              <LessonForm
-                <CardHeader display="flex">
+                key={editLesson?._id}
-                  <Heading as="h2" mt="0">
+                isLoading={crLQuery.isLoading}
-                    Создание лекции
+                onSubmit={onSubmit}
-                  </Heading>
+                onCancel={() => {
-                  <CloseButton ml="auto" onClick={() => setShowForm(false)} />
+                  setShowForm(false)
-                </CardHeader>
+                  setEditLesson(null)
-                <CardBody>
+                }}
-                  <form onSubmit={handleSubmit(onSubmit)}>
+                error={(crLQuery.error as any)?.error}
-                    <VStack spacing="10" align="left">
+                lesson={editLesson}
-                      <Controller
+                title={editLesson ? 'Редактирование лекции' : 'Создание лекции'}
-                        control={control}
+                nameButton={editLesson ? 'Редактировать' : 'Создать'}
-                        name="date"
+              />
-                        rules={{ required: 'Обязательное поле' }}
-                        render={({ field }) => (
-                          <FormControl>
-                            <FormLabel>Дата</FormLabel>
-                            <Input
-                              {...field}
-                              required={false}
-                              placeholder="Укажите дату лекции"
-                              size="md"
-                              type="datetime-local"
-                            />
-                            {errors.date ? (
-                              <FormErrorMessage>
-                                {errors.date?.message}
-                              </FormErrorMessage>
-                            ) : (
-                              <FormHelperText>
-                                Укажите дату и время лекции
-                              </FormHelperText>
-                            )}
-                          </FormControl>
-                        )}
-                      />
-
-                      <Controller
-                        control={control}
-                        name="name"
-                        rules={{ required: 'Обязательное поле' }}
-                        render={({ field }) => (
-                          <FormControl
-                            isRequired
-                            isInvalid={Boolean(errors.name)}
-                          >
-                            <FormLabel>Название новой лекции:</FormLabel>
-                            <Input
-                              {...field}
-                              required={false}
-                              placeholder="Название лекции"
-                              size="md"
-                            />
-                            {errors.name && (
-                              <FormErrorMessage>
-                                {errors.name.message}
-                              </FormErrorMessage>
-                            )}
-                          </FormControl>
-                        )}
-                      />
-                      <Box mt="10">
-                        <Button
-                          size="lg"
-                          type="submit"
-                          leftIcon={<AddIcon />}
-                          colorScheme="blue"
-                        >
-                          Создать
-                        </Button>
-                      </Box>
-                    </VStack>
-
-                    {crLQuery.error && (
-                      <ErrorSpan>{(crLQuery.error as any).error}</ErrorSpan>
-                    )}
-                  </form>
-                </CardBody>
-              </Card>
             ) : (
               <Box p="2" m="2">
                 <Button
@@ -312,7 +405,17 @@ const LessonList = () => {
             )}
           </Box>
         )}
-        <TableContainer whiteSpace="wrap">
+        {barFeature && sorted?.length && (
+          <Box height="300">
+            <Bar
+              data={sorted.map((lesson, index) => ({
+                lessonIndex: `#${index + 1}`,
+                count: lesson.students.length,
+              }))}
+            />
+          </Box>
+        )}
+        <TableContainer whiteSpace="wrap" pb={13}>
           <Table variant="striped" colorScheme="cyan">
             <Thead>
               <Tr>
@@ -325,46 +428,62 @@ const LessonList = () => {
                   Дата
                 </Th>
                 <Th>Название</Th>
-                <Th>action</Th>
+                {isTeacher(user) && <Th>action</Th>}
                 <Th isNumeric>Отмечено</Th>
               </Tr>
             </Thead>
             <Tbody>
-              {data?.body?.map((lesson) => (
+              {lessonCalc?.map(({ data: lessons, date }) => (
-                <Tr key={lesson._id}>
+                <React.Fragment key={date}>
-                  {isTeacher(user) && (
+                  {date && <Tr><Td colSpan={isTeacher(user) ? 5 : 3}>{dayjs(date).format('DD MMMM YYYY')}</Td></Tr>}
-                    <Td>
+                  {lessons.map((lesson) => (
-                      <Link
+                    <Tr key={lesson._id}>
-                        to={`${getNavigationsValue('journal.main')}/lesson/${courseId}/${lesson._id}`}
+                      {isTeacher(user) && (
-                        style={{ display: 'flex' }}
+                        <Td>
-                      >
+                          <Link
-                        <img
+                            to={`${getNavigationsValue('journal.main')}/lesson/${courseId}/${lesson._id}`}
-                          width={24}
+                            style={{ display: 'flex' }}
-                          src={qrCode}
+                          >
-                          style={{ margin: '0 auto' }}
+                            <img
-                        />
+                              width={24}
-                      </Link>
+                              src={qrCode}
-                    </Td>
+                              style={{ margin: '0 auto' }}
-                  )}
+                            />
-                  <Td textAlign="center">
+                          </Link>
-                    {dayjs(lesson.date).format('H:mm DD.MM.YY')}
+                        </Td>
-                  </Td>
+                      )}
-                  <Td>{lesson.name}</Td>
+                      <Td textAlign="center">
-                  <Td>
+                        {dayjs(lesson.date).format(groupByDate ? 'HH:mm' : 'HH:mm DD.MM.YY')}
-                    <Menu>
+                      </Td>
-                      <MenuButton as={Button}>
+                      <Td>{lesson.name}</Td>
-                        <EditIcon />
+                      {isTeacher(user) && (
-                      </MenuButton>
+                        <Td>
-                      <MenuList>
+                          <Menu>
-                        <MenuItem isDisabled>Edit</MenuItem>
+                            <MenuButton as={Button}>
-                        <MenuItem onClick={() => setlessonToDelete(lesson)}>
+                              <EditIcon />
-                          Delete
+                            </MenuButton>
-                        </MenuItem>
+                            <MenuList>
-                      </MenuList>
+                              <MenuItem
-                    </Menu>
+                                onClick={() => {
-                  </Td>
+                                  setShowForm(true)
-                  <Td isNumeric>{lesson.students.length}</Td>
+                                  setEditLesson(lesson)
-                </Tr>
+                                }}
+                              >
+                                Edit
+                              </MenuItem>
+                              <MenuItem
+                                onClick={() => setlessonToDelete(lesson)}
+                              >
+                                Delete
+                              </MenuItem>
+                            </MenuList>
+                          </Menu>
+                        </Td>
+                      )}
+                      <Td isNumeric>{lesson.students.length}</Td>
+                    </Tr>
+                  ))}
+                </React.Fragment>
               ))}
             </Tbody>
           </Table>
@@ -375,3 +494,29 @@ const LessonList = () => {
 }
 
 export default LessonList
+
+const Bar = ({ data }) => (
+  <ResponsiveBar
+    data={data}
+    keys={['count']}
+    indexBy="lessonIndex"
+    margin={{ top: 50, right: 130, bottom: 50, left: 60 }}
+    padding={0.3}
+    valueScale={{ type: 'linear' }}
+    indexScale={{ type: 'band', round: true }}
+    colors={{ scheme: 'set3' }}
+    axisTop={null}
+    axisRight={null}
+    labelSkipWidth={12}
+    labelSkipHeight={12}
+    labelTextColor={{
+      from: 'color',
+      modifiers: [['brighter', 1.4]],
+    }}
+    role="application"
+    ariaLabel="График посещаемости лекций"
+    barAriaLabel={(e) =>
+      e.id + ': ' + e.formattedValue + ' on lection: ' + e.indexValue
+    }
+  />
+)

src/pages/style.ts

@@ -1,63 +1,8 @@
 import styled from '@emotion/styled'
-import { css, keyframes } from '@emotion/react'
+import { keyframes } from '@emotion/react'
-import {
-  Card
-} from '@chakra-ui/react'
 
 export const BreadcrumbsWrapper = styled.div`
   padding: 12px;
-`;
-
-export const MainWrapper = styled.main`
-  display: flex;
-  justify-content: center;
-  height: 100%;
-`
-
-export const InputWrapper = styled.div`
-  position: relative;
-  padding: 12px;
-  display: flex;
-  align-items: center;
-
-  @media screen and (max-width: 600px) {
-    flex-direction: column;
-  }
-`
-export const InputLabel = styled.label`
-  position: absolute;
-  top: -8px;
-  left: 24px;
-  z-index: 2;
-`
-export const InputElement = styled.input`
-  border: 1px solid #ccc;
-  padding: 12px;
-  font-size: 24px;
-  border-radius: 8px;
-  color: #117623;
-  max-width: 90vw;
-  box-shadow: inset 7px 8px 20px 8px #4990db12;
-`
-
-export const StyledCard = styled(Card)`
-  box-shadow: 2px 2px 6px #0000005c;
-  padding: 16px;
-  border-radius: 12px;
-  min-width: 400px;
-`
-
-export const ArrowImg = styled.img`
-  width: 48px;
-  height: 48px;
-`
-
-export const IconButton = styled.button`
-  border: none;
-  background-color: rgba(0, 0, 0, 0);
-  display: flex;
-  align-items: center;
-  height: 100%;
 `
 
 const reveal = keyframes`
@@ -70,77 +15,15 @@ const reveal = keyframes`
     }
 `
 
-export const StartWrapper = styled.div`
+export const StudentList = styled.ul`
-  animation: ${reveal} 0.4s ease forwards;
-  height: calc(100vh - 300px);
-  position: relative;
-`
-
-export const Wrapper = styled.div`
-  display: flex;
-  flex-direction: row;
-  gap: 20px;
-  width: auto;
-`
-
-export const UnorderList = styled.ul`
   padding-left: 0px;
   height: 600px;
-  overflow: auto;
+  justify-content: space-evenly;
   padding-right: 20px;
-`
+  display: flex;
-
+  flex-direction: row;
-export const Svg = styled.svg`
+  flex-wrap: wrap;
-  position: absolute;
+  gap: 8px;
-  top: 50%;
-  left: 50%;
-  transform-origin: 50% 50%;
-  transform: translate(-50%, -50%);
-`
-
-export const Papper = styled.div`
-  position: relative;
-  background-color: #ffffff;
-  border-radius: 12px;
-  padding: 32px 16px 16px;
-  box-shadow: 2px 2px 6px #0000005c;
-`
-
-export const LessonItem = styled.li<{ warn?: boolean }>`
-  list-style: none;
-  background-color: #ffffff;
-  padding: 16px;
-  border-radius: 12px;
-  box-shadow: 2px 2px 6px #0000005c;
-  margin-bottom: 12px;
-  transition: all 0.5;
-
-  ${(props) =>
-    props.warn
-      ? css`
-          background-color: #fde3c5;
-          color: #919191;
-          box-shadow: inset 3px 2px 7px #c9b5a9;
-        `
-      : ''}
-`
-
-export const AddMissedButton = styled.button`
-  float: right;
-  border: none;
-  background-color: #00000000;
-  opacity: 0.1;
-
-  :hover {
-    cursor: pointer;
-    opacity: 1;
-  }
-`
-
-export const Lessonname = styled.span`
-  display: inline-box;
-  margin-right: 12px;
-  margin-bottom: 20px;
 `
 
 export const QRCanvas = styled.canvas`
@@ -154,29 +37,3 @@ export const ErrorSpan = styled.span`
   background-color: #d32f0b;
   border-radius: 11px;
 `
-
-export const Cross = styled.button`
-  position: absolute;
-  right: 19px;
-  top: 14px;
-  font-size: 24px;
-  padding: 7px;
-  cursor: pointer;
-  background-color: #fff;
-  border: none;
-
-  :hover {
-    background-color: #d7181812;
-    border-radius: 20px;
-  }
-`
-
-export const AddButton = styled.button`
-  background-color: transparent;
-  border: none;
-  cursor: pointer;
-
-  :hover {
-    box-shadow: 3px 2px 5px #00000038;
-  }
-`

src/pages/user-page.tsx

@@ -1,15 +1,20 @@
 import React from 'react'
 import { useParams } from 'react-router-dom'
 
-import {
-  ErrorSpan,
-  LessonItem,
-  Lessonname,
-  MainWrapper,
-  StartWrapper,
-} from './style'
 import { api } from '../__data__/api/api'
 import dayjs from 'dayjs'
+import {
+  Alert,
+  AlertIcon,
+  Box,
+  Center,
+  Container,
+  Heading,
+  Spinner,
+  Text,
+  Stack,
+} from '@chakra-ui/react'
+import { UserCard } from '../components/user-card'
 
 const UserPage = () => {
   const { lessonId, accessId } = useParams()
@@ -20,38 +25,67 @@ const UserPage = () => {
     skipPollingIfUnfocused: true,
   })
 
+  if (acc.isLoading) {
+    return (
+      <Container maxW="container.xl">
+        <Center h="300px">
+          <Spinner
+            thickness="4px"
+            speed="0.65s"
+            emptyColor="gray.200"
+            color="blue.500"
+            size="xl"
+          />
+        </Center>
+      </Container>
+    )
+  }
+
   return (
-    <MainWrapper>
+    <Container>
-      <StartWrapper>
+      {acc.isLoading && <h1>Отправляем запрос</h1>}
-        {acc.isLoading && <h1>Отправляем запрос</h1>}
+      {acc.isSuccess && <h1>Успешно</h1>}
-        {acc.isSuccess && <h1>Успешно</h1>}
+
+      {acc.error && (
+        <Box mb="6" mt="2">
+          <Alert status="warning">
+            <AlertIcon />
+            {(acc as any).error?.data?.body?.errorMessage ===
+            'Code is expired' ? (
+              'Не удалось активировать код доступа. Попробуйте отсканировать код ещё раз'
+            ) : (
+              <pre>{JSON.stringify(acc.error, null, 4)}</pre>
+            )}
+          </Alert>
+        </Box>
+      )}
+
+      <Box mb={6}>
+        <Text fontSize={18} fontWeight={600} as="h1" mt="4" mb="3">
+          Тема занятия: {ls.data?.body?.name}
+        </Text>
 
-        {acc.error && (
-          <div style={{ padding: 12, marginTop: 24, fontSize: 36 }}>
-            <ErrorSpan>
-              {(acc as any).error?.data?.body?.errorMessage ===
-              'Code is expired' ? (
-                'Не удалось активировать код доступа. Попробуйте отсканировать код ещё раз'
-              ) : (
-                <pre>{JSON.stringify(acc.error, null, 4)}</pre>
-              )}
-            </ErrorSpan>
-          </div>
-        )}
-        <h1>Тема занятия - {ls.data?.body?.name}</h1>
         <span>{dayjs(ls.data?.body?.date).format('DD MMMM YYYYг.')}</span>
+      </Box>
 
-        <ul style={{ paddingLeft: 0 }}>
+      <Box
-          {ls.data?.body?.students?.map((student, index) => (
+        as="ul"
-            <LessonItem key={index}>
+        display="flex"
-              <Lessonname>
+        flexWrap="wrap"
-                {student.name || student.preferred_username}
+        justifyContent="center"
-              </Lessonname>
+        gap={3}
-            </LessonItem>
+      >
-          ))}
+        {ls.data?.body?.students?.map((student) => (
-        </ul>
+          <UserCard
-      </StartWrapper>
+            width="40%"
-    </MainWrapper>
+            wrapperAS="li"
+            key={student.sub}
+            student={student}
+            present
+          />
+        ))}
+      </Box>
+    </Container>
   )
 }
 

stubs/api/index.js

@@ -45,4 +45,12 @@ router.get('/lesson/:lessonId', (req, res) => {
   res.send(require('../mocks/lessons/byid/success.json'))
 })
 
+router.delete('/lesson/:lessonId', (req, res) => {
+  res.send({ success: true, body: { ok: true }})
+})
+
+router.put('/lesson', (req, res) => {
+  res.send({ success: true, body: req.body })
+})
+
 module.exports = router

stubs/mocks/lessons/byid/success.json

@@ -17,7 +17,145 @@
               "given_name": "Александр",
               "family_name": "Примаков",
               "email": "primakovpro@gmail.com"
-          }
+          },{
+            "sub": "fcde3f22-d9ba-412a-a572-c59e515a290f",
+            "email_verified": true,
+            "name": "Мария Капитанова",
+            "preferred_username": "maryaKapitan@gmail.com",
+            "given_name": "Мария",
+            "family_name": "Капитанова",
+            "email": "maryaKapitan@gmail.com",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocJgIjjOFD2YUSyRF5kH4jaysE6X5p-kq0Cg0CFncfMi=s96-c"
+        },
+        {
+            "sub": "5b072deb-33ee-443e-9718-3b5720a3dfb7",
+            "email_verified": true,
+            "name": "Евгений Кореной",
+            "preferred_username": "koren@gmail.com",
+            "given_name": "Кореной",
+            "family_name": "Евгений",
+            "email": "koren@gmail.com",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocJpVhDeG-Rpjjm2Un6r8ACz_s_injuIFKpzXf3qmyCn3Cg=s96-c"
+        },
+        {
+            "sub": "7adf0cd1-cf07-4079-88d8-1a5c9b8f42c2",
+            "email_verified": true,
+            "name": "Ирина Игнатьева",
+            "preferred_username": "irign@gmailcom",
+            "given_name": "Ирина",
+            "family_name": "Игнатьева",
+            "email": "irign@gmailcom",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocL45E4Gt8D5oyIl3ipkcGsv4ShWGs3bdlwEMA_1rzGZ=s96-c"
+        },
+        {
+            "sub": "95ccc005-95b9-4305-9447-364a32033911",
+            "email_verified": true,
+            "name": "Иван Петров",
+            "preferred_username": "petrov@mail.ru",
+            "given_name": "Иван",
+            "family_name": "Петров",
+            "email": "petrov@mail.ru",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocIgQn5mfDAh2djx-3ofG9z1Em26ZyuUgVPd-6rDOl6z=s96-c"
+        },
+        {
+            "sub": "ede1ef2c-6ecf-484a-8fb8-282a77e1caa1",
+            "email_verified": true,
+            "name": "Константин Тимуров",
+            "preferred_username": "konstantK@gmail.com",
+            "given_name": "Константин",
+            "family_name": "Тимуров",
+            "email": "konstantK@gmail.com",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocJjnOfqaoAU_D4STrJPN9fPOeJ8tv60WbWVZu2ZWcHs=s96-c"
+        },
+        {
+            "sub": "92cc6a15-805c-4439-b592-b23f32d6d208",
+            "email_verified": true,
+            "name": "Александра Питерская",
+            "preferred_username": "piteralex@gmail.com",
+            "given_name": "Александра",
+            "family_name": "Питерская",
+            "email": "piteralex@gmail.com",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocKhbCbWvBBc_m7bjU5sLCE-dQ-KygBk-aUCSR8XaYtq=s96-c"
+        },
+        {
+            "sub": "4a3ba8b8-4120-4877-a160-be9ba4d5b3e3",
+            "email_verified": true,
+            "name": "Анастасия Светлых",
+            "preferred_username": "anastasya@gmail.ocm",
+            "given_name": "Анастасия",
+            "family_name": "Светлых",
+            "email": "anastasya@gmail.ocm",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocJnsM8UGhbH806yLVgWZ17g3-gJFVcG0Uz5kvqT7dvC=s96-c"
+        },
+        {
+            "sub": "b4634921-00b3-4082-9284-8ac47f269394",
+            "email_verified": true,
+            "name": "Эмилия Снежко",
+            "preferred_username": "emi@mail.ru",
+            "given_name": "Эмилия",
+            "family_name": "Снежко",
+            "email": "emi@mail.ru",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocI98dzSFQDPr2LXMPFEUX8KLY6bY2m08O_aAj2B5KVNKg=s96-c"
+        },
+        {
+            "sub": "bf1a95aa-39a2-4528-9b8d-319409995df5",
+            "email_verified": true,
+            "name": "Юлия Бобова",
+            "preferred_username": "bobova@gmail.com",
+            "given_name": "Юлия",
+            "family_name": "Бобова",
+            "email": "bobova@gmail.com",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocJ_Ud4iI-jgqcJ3QJcWpESbRLX_C1BnB8_7uTTC-4Dn=s96-c"
+        },
+        {
+            "sub": "c273a3e3-f7ba-4057-8c57-a1f43b6174a5",
+            "email_verified": true,
+            "name": "Анна Самоварова",
+            "preferred_username": "samovar@gmail.com",
+            "given_name": "Анна",
+            "family_name": "Самоварова",
+            "email": "samovar@gmail.com",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocJOhIMdQkXPd55wTMgTTkUCnqbsu4EncgEPm67iz_mK=s96-c"
+        },
+        {
+            "sub": "8555885b-715c-4dee-a7c5-9563a6a05211",
+            "email_verified": true,
+            "name": "Евгения Жужова",
+            "preferred_username": "zhuzhova@gmail.com",
+            "given_name": "Евгения",
+            "family_name": "Жужова",
+            "email": "zhuzhova@gmail.com",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocJUtJBAVBm642AxoGpMDDMV8CPu3MEoLjU3hmO7oisG=s96-c"
+        },
+        {
+            "sub": "12dee54f-64e9-4be3-9cb0-02ff07ab24fe",
+            "email_verified": true,
+            "name": "Эдгар Петренко",
+            "preferred_username": "petrenk@mail.ru",
+            "given_name": "Эдгар",
+            "family_name": "Петренко",
+            "email": "petrenk@mail.ru",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocLgKAZag32kpGVHMVbh_GsU-rX_MAtmeVIPoov0ZPBYIA=s96-c"
+        },
+        {
+            "sub": "4082b72a-4730-4841-ad68-06a0e19263df",
+            "email_verified": true,
+            "name": "Елена Вавилон",
+            "preferred_username": "elenvavil@mail.ru",
+            "given_name": "Елена",
+            "family_name": "Вавилон",
+            "email": "elenvavil@mail.ru",
+            "picture": "https://lh3.googleusercontent.com/a/ACg8ocKXcmzcqRch2--j2Ge2m9e8MIOZ8y1MjsQ0cSEoXOmW=s96-c"
+        },
+        {
+            "sub": "9e8a08d8-d76a-4f26-99c5-9a1d3c067104",
+            "email_verified": true,
+            "name": "Ольга Шарова",
+            "preferred_username": "julyashap",
+            "given_name": "Ольга",
+            "family_name": "Шарова",
+            "email": "sharova@mail.ru"
+        }
       ],
       "date": "2024-02-28T20:37:00.057Z",
       "created": "2024-02-28T20:37:00.057Z",