diff --git a/hwproj.front/package-lock.json b/hwproj.front/package-lock.json
index a0882868d..fe2e3c324 100644
--- a/hwproj.front/package-lock.json
+++ b/hwproj.front/package-lock.json
@@ -20,6 +20,7 @@
         "@mui/lab": "^5.0.0-alpha.99",
         "@mui/material": "^5.16.11",
         "@mui/x-charts": "^8.2.0",
+        "@reduxjs/toolkit": "^2.11.2",
         "@storybook/addon-knobs": "^6.3.0",
         "@types/bluebird": "^3.5.36",
         "@types/classnames": "^2.3.1",
@@ -52,6 +53,7 @@
         "react-drag-drop-files": "^3.1.0",
         "react-markdown": "^5.0.0",
         "react-query": "^3.21.1",
+        "react-redux": "^9.2.0",
         "react-router-dom": "^6.5.0",
         "react-social-login-buttons": "^3.5.1",
         "react-syntax-highlighter": "^15.5.0",
@@ -4564,6 +4566,32 @@
         "url": "https://opencollective.com/popperjs"
       }
     },
+    "node_modules/@reduxjs/toolkit": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.11.2.tgz",
+      "integrity": "sha512-Kd6kAHTA6/nUpp8mySPqj3en3dm0tdMIgbttnQ1xFMVpufoj+ADi8pXLBsd4xzTRHQa7t/Jv8W5UnCuW4kuWMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@standard-schema/spec": "^1.0.0",
+        "@standard-schema/utils": "^0.3.0",
+        "immer": "^11.0.0",
+        "redux": "^5.0.1",
+        "redux-thunk": "^3.1.0",
+        "reselect": "^5.1.0"
+      },
+      "peerDependencies": {
+        "react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
+        "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-redux": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@remix-run/router": {
       "version": "1.23.0",
       "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
@@ -4874,6 +4902,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
+      "license": "MIT"
+    },
+    "node_modules/@standard-schema/utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
+      "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
+      "license": "MIT"
+    },
     "node_modules/@storybook/addon-knobs": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-6.4.0.tgz",
@@ -4977,6 +5017,7 @@
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.5.16.tgz",
       "integrity": "sha512-p3DqQi+8QRL5k7jXhXmJZLsE/GqHqyY6PcoA1oNTJr0try48uhTGUOYkgzmqtDaa/qPFO5LP+xCPzZXckGtquQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/api": "6.5.16",
@@ -5004,12 +5045,14 @@
       "version": "0.13.11",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@storybook/api": {
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.5.16.tgz",
       "integrity": "sha512-HOsuT8iomqeTMQJrRx5U8nsC7lJTwRr1DhdD0SzlqL4c80S/7uuCy4IZvOt4sYQjOzW5fOo/kamcoBXyLproTA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/channels": "6.5.16",
@@ -5043,6 +5086,7 @@
       "version": "0.13.11",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@storybook/builder-webpack4": {
@@ -5441,6 +5485,7 @@
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.5.16.tgz",
       "integrity": "sha512-VylzaWQZaMozEwZPJdyJoz+0jpDa8GRyaqu9TGG6QGv+KU5POoZaGLDkRE7TzWkyyP0KQLo80K99MssZCpgSeg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "core-js": "^3.8.2",
@@ -5500,6 +5545,7 @@
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.5.16.tgz",
       "integrity": "sha512-pxcNaCj3ItDdicPTXTtmYJE3YC1SjxFrBmHcyrN+nffeNyiMuViJdOOZzzzucTUG0wcOOX8jaSyak+nnHg5H1Q==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "core-js": "^3.8.2",
@@ -5514,6 +5560,7 @@
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/components/-/components-6.5.16.tgz",
       "integrity": "sha512-LzBOFJKITLtDcbW9jXl0/PaG+4xAz25PK8JxPZpIALbmOpYWOAPcO6V9C2heX6e6NgWFMUxjplkULEk9RCQMNA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/client-logger": "6.5.16",
@@ -5538,6 +5585,7 @@
       "version": "0.13.11",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@storybook/core": {
@@ -5704,6 +5752,7 @@
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.5.16.tgz",
       "integrity": "sha512-qMZQwmvzpH5F2uwNUllTPg6eZXr2OaYZQRRN8VZJiuorZzDNdAFmiVWMWdkThwmyLEJuQKXxqCL8lMj/7PPM+g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "core-js": "^3.8.2"
@@ -5804,6 +5853,7 @@
       "version": "0.0.2--canary.4566f4d.1",
       "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.2--canary.4566f4d.1.tgz",
       "integrity": "sha512-9OVvMVh3t9znYZwb0Svf/YQoxX2gVOeQTGe2bses2yj+a3+OJnCrUF3/hGv6Em7KujtOdL2LL+JnG49oMVGFgQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.15"
@@ -6276,6 +6326,7 @@
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.5.16.tgz",
       "integrity": "sha512-ZgeP8a5YV/iuKbv31V8DjPxlV4AzorRiR8OuSt/KqaiYXNXlOoQDz/qMmiNcrshrfLpmkzoq7fSo4T8lWo2UwQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/client-logger": "6.5.16",
@@ -6297,12 +6348,14 @@
       "version": "0.13.11",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@storybook/semver": {
       "version": "7.3.2",
       "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
       "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "core-js": "^3.6.5",
@@ -6319,6 +6372,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
@@ -6332,6 +6386,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
@@ -6344,6 +6399,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
@@ -6359,6 +6415,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
@@ -6442,6 +6499,7 @@
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.5.16.tgz",
       "integrity": "sha512-hNLctkjaYLRdk1+xYTkC1mg4dYz2wSv6SqbLpcKMbkPHTE0ElhddGPHQqB362md/w9emYXNkt1LSMD8Xk9JzVQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/client-logger": "6.5.16",
@@ -6462,6 +6520,7 @@
       "version": "0.13.11",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@storybook/ui": {
@@ -7088,6 +7147,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@types/is-function/-/is-function-1.0.3.tgz",
       "integrity": "sha512-/CLhCW79JUeLKznI6mbVieGbl4QU5Hfn+6udw1YHZoofASjbQ5zaP5LzAUZYDpRYEjS4/P+DhEgyJ/PQmGGTWw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/isomorphic-fetch": {
@@ -7437,6 +7497,12 @@
       "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
       "license": "MIT"
     },
+    "node_modules/@types/use-sync-external-store": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
+      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
+      "license": "MIT"
+    },
     "node_modules/@types/webpack": {
       "version": "4.41.40",
       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.40.tgz",
@@ -7456,6 +7522,7 @@
       "version": "1.18.8",
       "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.8.tgz",
       "integrity": "sha512-G9eAoJRMLjcvN4I08wB5I7YofOb/kaJNd5uoCMX+LbKXTPCF+ZIHuqTnFaK9Jz1rgs035f9JUPUhNFtqgucy/A==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/webpack-sources": {
@@ -17528,6 +17595,16 @@
         "node": ">= 4"
       }
     },
+    "node_modules/immer": {
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-11.1.3.tgz",
+      "integrity": "sha512-6jQTc5z0KJFtr1UgFpIL3N9XSC3saRaI9PwWtzM2pSqkNGtiNkYY2OSwkOGDK2XcTRcLb1pi/aNkKZz0nxVH4Q==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
     "node_modules/import-fresh": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
@@ -18027,6 +18104,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
       "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/is-generator-function": {
@@ -18149,6 +18227,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
       "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -18226,6 +18305,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
       "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -18697,13 +18777,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/jquery": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/js-sha3": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
@@ -19343,6 +19416,7 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz",
       "integrity": "sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/map-visit": {
@@ -20535,6 +20609,7 @@
       "version": "1.11.3",
       "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
       "integrity": "sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "map-or-similar": "^1.5.0"
@@ -20591,21 +20666,6 @@
         "safe-buffer": "~5.1.0"
       }
     },
-    "node_modules/meow": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz",
-      "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/merge-descriptors": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
@@ -22516,6 +22576,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -22718,6 +22779,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -22870,18 +22932,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "license": "MIT",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
     "node_modules/portable-fetch": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/portable-fetch/-/portable-fetch-3.0.0.tgz",
@@ -23769,6 +23819,29 @@
         }
       }
     },
+    "node_modules/react-redux": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
+      "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/use-sync-external-store": "^0.0.6",
+        "use-sync-external-store": "^1.4.0"
+      },
+      "peerDependencies": {
+        "@types/react": "^18.2.25 || ^19",
+        "react": "^18.0 || ^19",
+        "redux": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "redux": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
@@ -24076,6 +24149,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/redux": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
+      "license": "MIT"
+    },
+    "node_modules/redux-thunk": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+      "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "redux": "^5.0.0"
+      }
+    },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
@@ -27176,6 +27264,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
       "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -28052,6 +28141,7 @@
       "version": "2.14.4",
       "resolved": "https://registry.npmjs.org/store2/-/store2-2.14.4.tgz",
       "integrity": "sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/stream-browserify": {
@@ -28685,6 +28775,7 @@
       "version": "6.0.8",
       "resolved": "https://registry.npmjs.org/telejson/-/telejson-6.0.8.tgz",
       "integrity": "sha512-nerNXi+j8NK1QEfBHtZUN/aLdDcyupA//9kAboYLrtzZlPLpUfqbVGWb9zz91f/mIjRbAYhbgtnJHY8I1b5MBg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/is-function": "^1.0.0",
@@ -28701,6 +28792,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
       "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -29222,6 +29314,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
       "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.10"
@@ -30114,6 +30207,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/util.promisify": {
@@ -31969,21 +32063,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/yaml": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
-      "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
diff --git a/hwproj.front/package.json b/hwproj.front/package.json
index 0ddb05582..9698a7bd2 100644
--- a/hwproj.front/package.json
+++ b/hwproj.front/package.json
@@ -16,6 +16,7 @@
     "@mui/lab": "^5.0.0-alpha.99",
     "@mui/material": "^5.16.11",
     "@mui/x-charts": "^8.2.0",
+    "@reduxjs/toolkit": "^2.11.2",
     "@storybook/addon-knobs": "^6.3.0",
     "@types/bluebird": "^3.5.36",
     "@types/classnames": "^2.3.1",
@@ -48,6 +49,7 @@
     "react-drag-drop-files": "^3.1.0",
     "react-markdown": "^5.0.0",
     "react-query": "^3.21.1",
+    "react-redux": "^9.2.0",
     "react-router-dom": "^6.5.0",
     "react-social-login-buttons": "^3.5.1",
     "react-syntax-highlighter": "^15.5.0",
diff --git a/hwproj.front/src/components/Common/MentorsList.tsx b/hwproj.front/src/components/Common/MentorsList.tsx
index 68adeb04a..de10792f1 100644
--- a/hwproj.front/src/components/Common/MentorsList.tsx
+++ b/hwproj.front/src/components/Common/MentorsList.tsx
@@ -1,14 +1,18 @@
 import {FC} from "react";
-import {AccountDataDto} from "@/api";
 import {Typography} from "@material-ui/core";
 import * as React from "react";
 import {Stack, Tooltip} from "@mui/material";
+import { useAppSelector } from "@/store/hooks";
+import { AccountDataDto } from "@/api";
 
-const MentorsList: FC<{
-    mentors: AccountDataDto[]
-}> = (props) => {
+interface MentorsListProps {
+    mentors?: AccountDataDto[];
+}
+
+const MentorsList: FC<MentorsListProps> = ({ mentors: propMentors }) => {
+    const reduxMentors = useAppSelector(state => state.course.mentors);
+    const mentors = propMentors ?? reduxMentors;
     const count = 1
-    const {mentors} = props
     const mentorsToShow = mentors.length > count ? mentors.slice(0, count) : mentors
     const mentorsToHide = mentors.length > count ? mentors.slice(count) : []
     const fontSize = 18
diff --git a/hwproj.front/src/components/Courses/Course.tsx b/hwproj.front/src/components/Courses/Course.tsx
index c2309e0fe..f9f482873 100644
--- a/hwproj.front/src/components/Courses/Course.tsx
+++ b/hwproj.front/src/components/Courses/Course.tsx
@@ -1,13 +1,6 @@
 import * as React from "react";
 import {useSearchParams} from "react-router-dom";
-import {
-    AccountDataDto,
-    CourseViewModel,
-    FileInfoDTO,
-    HomeworkViewModel,
-    ScopeDTO,
-    StatisticsCourseMatesModel
-} from "@/api";
+import {FileInfoDTO,ScopeDTO,} from "@/api";
 import StudentStats from "./StudentStats";
 import NewCourseStudents from "./NewCourseStudents";
 import ApiSingleton from "../../api/ApiSingleton";
@@ -40,6 +33,12 @@ import {MoreVert} from "@mui/icons-material";
 import {DotLottieReact} from "@lottiefiles/dotlottie-react";
 import {CourseUnitType} from "../Files/CourseUnitType";
 import {FileStatus} from "../Files/FileStatus";
+import {useAppDispatch, useAppSelector} from "@/store/hooks";
+import {setCourse, setMentors, setAcceptedStudents, setNewStudents} from "@/store/slices/courseSlice";
+import {setHomeworks} from "@/store/slices/homeworkSlice";
+import {setStudentSolutions} from "@/store/slices/solutionSlice";
+import {setCourseFiles, updateCourseFiles, setProcessingLoading} from "@/store/slices/courseFileSlice";
+import {setAuth} from "@/store/slices/authSlice";
 
 type TabValue = "homeworks" | "stats" | "applications"
 
@@ -47,27 +46,6 @@ function isAcceptableTabValue(str: string): str is TabValue {
     return str === "homeworks" || str === "stats" || str === "applications";
 }
 
-interface ICourseState {
-    isFound: boolean;
-    course: CourseViewModel;
-    courseHomeworks: HomeworkViewModel[];
-    mentors: AccountDataDto[];
-    acceptedStudents: AccountDataDto[];
-    newStudents: AccountDataDto[];
-    studentSolutions: StatisticsCourseMatesModel[];
-    showQrCode: boolean;
-}
-
-interface ICourseFilesState {
-    processingFilesState: {
-        [homeworkId: number]: {
-            isLoading: boolean;
-            intervalId?: NodeJS.Timeout;
-        };
-    };
-    courseFiles: FileInfoDTO[];
-}
-
 interface IPageState {
     tabValue: TabValue
 }
@@ -78,53 +56,30 @@ const Course: React.FC = () => {
     const navigate = useNavigate()
     const {enqueueSnackbar} = useSnackbar()
 
-    const [courseState, setCourseState] = useState<ICourseState>({
-        isFound: false,
-        course: {},
-        courseHomeworks: [],
-        mentors: [],
-        acceptedStudents: [],
-        newStudents: [],
-        studentSolutions: [],
-        showQrCode: false
-    })
-    const [studentSolutions, setStudentSolutions] = useState<StatisticsCourseMatesModel[] | undefined>(undefined)
-    const [courseFilesState, setCourseFilesState] = useState<ICourseFilesState>({
-        processingFilesState: {},
-        courseFiles: []
-    })
+    const dispatch = useAppDispatch();
+    const course = useAppSelector(state => state.course.course);
+    const isFound = useAppSelector(state => state.course.isFound);
+    const mentors = useAppSelector(state => state.course.mentors);
+    const acceptedStudents = useAppSelector(state => state.course.acceptedStudents);
+    const newStudents = useAppSelector(state => state.course.newStudents);
+    const courseHomeworks = useAppSelector(state => state.homeworks.homeworks);
+    const studentSolutions = useAppSelector(state => state.solutions.studentSolutions);
+    const courseFiles = useAppSelector(state => state.courseFiles.courseFiles);
+    const processingFilesState = useAppSelector(state => state.courseFiles.processingFilesState);
+    const [showQrCode, setShowQrCode] = useState(false);
 
     const intervalsRef = React.useRef<Record<number, { interval: NodeJS.Timeout, timeout: NodeJS.Timeout }>>({});
 
-    const updateCourseFiles = (files: FileInfoDTO[], unitType: CourseUnitType, unitId: number) => {
-        setCourseFilesState(prev => ({
-            ...prev,
-            courseFiles: [
-                ...prev.courseFiles.filter(
-                    f => !(f.courseUnitType === unitType && f.courseUnitId === unitId)),
-                ...files
-            ]
-        }));
+    const handleUpdateCourseFiles = (files: FileInfoDTO[], unitType: CourseUnitType, unitId: number) => {
+        dispatch(updateCourseFiles({ files, unitType, unitId }));
     };
 
     const setCommonLoading = (homeworkId: number) => {
-        setCourseFilesState(prev => ({
-            ...prev,
-            processingFilesState: {
-                ...prev.processingFilesState,
-                [homeworkId]: {isLoading: true}
-            }
-        }));
+        dispatch(setProcessingLoading({ homeworkId, isLoading: true }));
     }
 
     const unsetCommonLoading = (homeworkId: number) => {
-        setCourseFilesState(prev => ({
-            ...prev,
-            processingFilesState: {
-                ...prev.processingFilesState,
-                [homeworkId]: {isLoading: false}
-            }
-        }));
+        dispatch(setProcessingLoading({ homeworkId, isLoading: false }));
     }
 
     const stopProcessing = (homeworkId: number) => {
@@ -169,14 +124,14 @@ const Course: React.FC = () => {
                 // Первый вариант для явного отображения всех файлов
                 if (waitingNewFilesCount === 0
                     && files.filter(f => f.status === FileStatus.ReadyToUse).length === previouslyExistingFilesCount - deletingFilesIds.length) {
-                    updateCourseFiles(files, scopeDto.courseUnitType as CourseUnitType, scopeDto.courseUnitId!)
+                    handleUpdateCourseFiles(files, scopeDto.courseUnitType as CourseUnitType, scopeDto.courseUnitId!)
                     unsetCommonLoading(homeworkId)
                 }
 
                 // Второй вариант для явного отображения всех файлов
                 if (waitingNewFilesCount > 0
                     && files.filter(f => !deletingFilesIds.some(dfi => dfi === f.id)).length === previouslyExistingFilesCount - deletingFilesIds.length + waitingNewFilesCount) {
-                    updateCourseFiles(files, scopeDto.courseUnitType as CourseUnitType, scopeDto.courseUnitId!)
+                    handleUpdateCourseFiles(files, scopeDto.courseUnitType as CourseUnitType, scopeDto.courseUnitId!)
                     unsetCommonLoading(homeworkId)
                 }
 
@@ -223,19 +178,16 @@ const Course: React.FC = () => {
         tabValue: "homeworks"
     })
 
-    const {
-        isFound,
-        course,
-        mentors,
-        newStudents,
-        acceptedStudents,
-        courseHomeworks,
-    } = courseState
-
-    const userId = ApiSingleton.authService.getUserId()
+    useEffect(() => {
+        const userId = ApiSingleton.authService.getUserId();
+        const isLecturer = ApiSingleton.authService.isLecturer();
+        const isExpert = ApiSingleton.authService.isExpert();
+        dispatch(setAuth({ userId, isLecturer, isExpert }))
+    }, [])
 
-    const isLecturer = ApiSingleton.authService.isLecturer()
-    const isExpert = ApiSingleton.authService.isExpert()
+    const userId = useAppSelector(state => state.auth.userId);
+    const isLecturer = useAppSelector(state => state.auth.isLecturer);
+    const isExpert = useAppSelector(state => state.auth.isExpert);
     const isMentor = isLecturer || isExpert
     const isCourseMentor = mentors.some(t => t.userId === userId)
     const isSignedInCourse = newStudents!.some(cm => cm.userId === userId)
@@ -272,16 +224,11 @@ const Course: React.FC = () => {
             return
         }
 
-        setCourseState(prevState => ({
-            ...prevState,
-            isFound: true,
-            course: course,
-            courseHomeworks: course.homeworks!,
-            createHomework: false,
-            mentors: course.mentors!,
-            acceptedStudents: course.acceptedStudents!,
-            newStudents: course.newStudents!,
-        }))
+        dispatch(setCourse(course));
+        dispatch(setMentors(course.mentors!));
+        dispatch(setAcceptedStudents(course.acceptedStudents!));
+        dispatch(setNewStudents(course.newStudents!));
+        dispatch(setHomeworks(course.homeworks!));
     }
 
     const getCourseFilesInfo = async () => {
@@ -289,20 +236,17 @@ const Course: React.FC = () => {
         try {
             courseFilesInfo = isCourseMentor
                 ? await ApiSingleton.filesApi.filesGetFilesInfo(+courseId!)
-                : await ApiSingleton.filesApi.filesGetUploadedFilesInfo(+courseId!)
+                : await ApiSingleton.filesApi.filesGetUploadedFilesInfo(+courseId!);
         } catch (e) {
             const responseErrors = await ErrorsHandler.getErrorMessages(e as Response)
             enqueueSnackbar(responseErrors[0], {variant: "warning", autoHideDuration: 1990});
         }
-        setCourseFilesState(prevState => ({
-            ...prevState,
-            courseFiles: courseFilesInfo
-        }))
+        dispatch(setCourseFiles(courseFilesInfo));
     }
 
     useEffect(() => {
         setCurrentState()
-    }, [])
+    }, [courseId])
 
     useEffect(() => {
         getCourseFilesInfo()
@@ -310,7 +254,7 @@ const Course: React.FC = () => {
 
     useEffect(() => {
         ApiSingleton.statisticsApi.statisticsGetCourseStatistics(+courseId!)
-            .then(res => setStudentSolutions(res))
+            .then(res => dispatch(setStudentSolutions(res)))
     }, [courseId])
 
     useEffect(() => changeTab(tab || "homeworks"), [tab, courseId, isFound])
@@ -323,7 +267,7 @@ const Course: React.FC = () => {
     const {tabValue} = pageState
     const searchedHomeworkId = searchParams.get("homeworkId")
 
-    const unratedSolutionsCount = (studentSolutions || [])
+    const unratedSolutionsCount = studentSolutions
         .flatMap(x => x.homeworks)
         .flatMap(x => x!.tasks)
         .filter(t => t!.solution!.slice(-1)[0]?.state === 0) //last solution
@@ -367,10 +311,7 @@ const Course: React.FC = () => {
                             </ListItemIcon>
                             <ListItemText>Управление</ListItemText>
                         </MenuItem>}
-                    <MenuItem onClick={() => setCourseState(prevState => ({
-                        ...prevState,
-                        showQrCode: true
-                    }))}>
+                    <MenuItem onClick={() => setShowQrCode(true)}>
                         <ListItemIcon>
                             <QrCode2Icon fontSize="small"/>
                         </ListItemIcon>
@@ -391,8 +332,8 @@ const Course: React.FC = () => {
         return (
             <div className="container">
                 <Dialog
-                    open={courseState.showQrCode}
-                    onClose={() => setCourseState(prevState => ({...prevState, showQrCode: false}))}
+                    open={showQrCode}
+                    onClose={() => setShowQrCode(false)}
                 >
                     <DialogTitle>
                         Поделитесь ссылкой на курс с помощью QR-кода
@@ -407,7 +348,7 @@ const Course: React.FC = () => {
                 </Dialog>
                 <Grid style={{marginTop: "15px"}}>
                     <Grid container direction={"column"} spacing={2}>
-                        {course.isCompleted && <Grid item>
+                        {course?.isCompleted && <Grid item>
                             <Alert severity="warning">
                                 <AlertTitle>Курс завершен!</AlertTitle>
                                 {isAcceptedStudent
@@ -422,7 +363,7 @@ const Course: React.FC = () => {
                             <Grid item>
                                 <Stack direction={"row"} spacing={1} alignItems={"start"}>
                                     <Typography component="div" style={{fontSize: '22px'}}>
-                                        {NameBuilder.getCourseFullName(course.name!, course.groupName)}
+                                        {NameBuilder.getCourseFullName(course?.name || "", course?.groupName || "")}
                                     </Typography>
                                     <CourseMenu/>
                                 </Stack>
@@ -430,11 +371,10 @@ const Course: React.FC = () => {
                             <Grid item>
                                 <Grid container alignItems="center" justifyContent="flex-end">
                                     <Grid item>
-                                        <MentorsList mentors={mentors}/>
+                                        <MentorsList />
                                     </Grid>
                                     {lecturerStatsState &&
                                         <LecturerStatistics
-                                            courseId={+courseId!}
                                             onClose={() => setLecturerStatsState(false)}
                                         />
                                     }
@@ -488,68 +428,17 @@ const Course: React.FC = () => {
                             </Stack>}/>}
                     </Tabs>
                     {tabValue === "homeworks" && <CourseExperimental
-                        courseId={+courseId!}
-                        homeworks={courseHomeworks}
-                        courseFilesInfo={courseFilesState.courseFiles}
-                        isMentor={isCourseMentor}
-                        studentSolutions={studentSolutions || []}
-                        isStudentAccepted={isAcceptedStudent}
-                        selectedHomeworkId={searchedHomeworkId == null ? undefined : +searchedHomeworkId}
-                        userId={userId!}
-                        processingFiles={courseFilesState.processingFilesState}
                         onStartProcessing={getFilesByInterval}
-                        onHomeworkUpdate={({fileInfos, homework, isDeleted}) => {
-                            const homeworkIndex = courseState.courseHomeworks.findIndex(x => x.id === homework.id)
-                            const homeworks = courseState.courseHomeworks
-
-                            if (isDeleted) homeworks.splice(homeworkIndex, 1)
-                            else if (homeworkIndex === -1) homeworks.push(homework)
-                            else homeworks[homeworkIndex] = homework
-
-                            setCourseState(prevState => ({
-                                ...prevState,
-                                courseHomeworks: homeworks
-                            }))
-                        }}
-                        onTaskUpdate={update => {
-                            const task = update.task
-                            const homeworks = courseState.courseHomeworks
-                            const homework = homeworks.find(x => x.id === task.homeworkId)!
-                            const tasks = [...homework.tasks!]
-                            const taskIndex = tasks.findIndex(x => x!.id === task.id)
-
-                            if (update.isDeleted) tasks.splice(taskIndex, 1)
-                            else if (taskIndex !== -1) tasks![taskIndex] = task
-                            else tasks.push(task)
-
-                            homework.tasks = tasks
-
-                            setCourseState(prevState => ({
-                                ...prevState,
-                                courseHomeworks: homeworks
-                            }))
-                        }}
                     />
                     }
                     {tabValue === "stats" &&
                         <Grid container style={{marginBottom: "15px"}}>
                             <Grid item xs={12}>
-                                <StudentStats
-                                    homeworks={courseHomeworks}
-                                    userId={userId as string}
-                                    isMentor={isCourseMentor}
-                                    course={courseState.course}
-                                    solutions={studentSolutions}
-                                />
+                                <StudentStats />
                             </Grid>
                         </Grid>}
                     {tabValue === "applications" && showApplicationsTab &&
-                        <NewCourseStudents
-                            onUpdate={() => setCurrentState()}
-                            course={courseState.course}
-                            students={courseState.newStudents}
-                            courseId={courseId!}
-                        />
+                        <NewCourseStudents/>
                     }
                 </Grid>
             </div>
@@ -564,4 +453,4 @@ const Course: React.FC = () => {
     </div>
 }
 
-export default Course
+export default Course
\ No newline at end of file
diff --git a/hwproj.front/src/components/Courses/CourseExperimental.tsx b/hwproj.front/src/components/Courses/CourseExperimental.tsx
index b5d1819fe..fe863c8b7 100644
--- a/hwproj.front/src/components/Courses/CourseExperimental.tsx
+++ b/hwproj.front/src/components/Courses/CourseExperimental.tsx
@@ -4,6 +4,8 @@ import {
     HomeworkTaskViewModel,
     HomeworkViewModel, Solution, StatisticsCourseMatesModel,
 } from "@/api";
+import {useAppDispatch, useAppSelector} from "@/store/hooks";
+import {updateOrInsertHomework, deleteHomework, updateTask, deleteTask} from "@/store/slices/homeworkSlice";
 import {
     AlertTitle,
     Button,
@@ -23,7 +25,7 @@ import TimelineContent from '@mui/lab/TimelineContent';
 import TimelineDot from '@mui/lab/TimelineDot';
 import TimelineOppositeContent from '@mui/lab/TimelineOppositeContent';
 import {Alert, Card, CardActions, Chip, Paper, Stack, Tooltip} from "@mui/material";
-import {Link} from "react-router-dom";
+import {Link, useSearchParams} from "react-router-dom";
 import StudentStatsUtils from "../../services/StudentStatsUtils";
 import {BonusTag, DefaultTags, getTip, isBonusWork, isTestWork, TestTag} from "../Common/HomeworkTags";
 import FileInfoConverter from "components/Utils/FileInfoConverter";
@@ -37,23 +39,6 @@ import SwitchAccessShortcutIcon from '@mui/icons-material/SwitchAccessShortcut';
 import Lodash from "lodash";
 
 interface ICourseExperimentalProps {
-    homeworks: HomeworkViewModel[]
-    courseFilesInfo: FileInfoDTO[]
-    studentSolutions: StatisticsCourseMatesModel[]
-    courseId: number
-    isMentor: boolean
-    isStudentAccepted: boolean
-    userId: string
-    selectedHomeworkId: number | undefined
-    onHomeworkUpdate: (update: { homework: HomeworkViewModel, fileInfos: FileInfoDTO[] | undefined } & {
-        isDeleted?: boolean
-    }) => void
-    onTaskUpdate: (update: { task: HomeworkTaskViewModel, isDeleted?: boolean }) => void,
-    processingFiles: {
-        [homeworkId: number]: {
-            isLoading: boolean;
-        };
-    };
     onStartProcessing: (homeworkId: number, previouslyExistingFilesCount: number, waitingNewFilesCount: number, deletingFilesIds: number[]) => void;
 }
 
@@ -66,10 +51,23 @@ interface ICourseExperimentalState {
 }
 
 export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
+    const dispatch = useAppDispatch()
+    const allHomeworks = useAppSelector(state => state.homeworks.homeworks)
+    const studentSolutions = useAppSelector(state => state.solutions.studentSolutions)
+    const courseFilesInfo = useAppSelector(state => state.courseFiles.courseFiles)
+    const mentors = useAppSelector(state => state.course.mentors)
+    const course = useAppSelector(state => state.course.course)
+    const acceptedStudents = useAppSelector(state => state.course.acceptedStudents)
+    const userId = useAppSelector(state => state.auth.userId)
+    
+    const courseId = course?.id ?? 0
+    const isAcceptedStudent = acceptedStudents.some(s => s.userId === userId)
+
     const [hideDeferred, setHideDeferred] = useState<boolean>(false)
     const [showOnlyGroupedTest, setShowOnlyGroupedTest] = useState<string | undefined>(undefined)
     const filterAdded = hideDeferred || showOnlyGroupedTest !== undefined
 
+    const isMentor = mentors.some(m => m.userId === userId)
     // Определяем разрешение экрана пользователя
     const theme = useTheme();
     const isMobile = useMediaQuery(theme.breakpoints.down('md'));
@@ -77,13 +75,14 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
     // Состояние для кнопки "Наверх"
     const [showScrollButton, setShowScrollButton] = useState(false);
 
-    const homeworks = props.homeworks.slice().reverse().filter(x => {
+    const homeworks = allHomeworks.slice().reverse().filter(x => {
         if (hideDeferred) return !x.isDeferred
         if (showOnlyGroupedTest !== undefined) return x.tags!.includes(TestTag) && x.tags!.includes(showOnlyGroupedTest)
         return true
     })
 
-    const {isMentor, studentSolutions, isStudentAccepted, userId, selectedHomeworkId, courseFilesInfo} = props
+    const [ searchParams ]= useSearchParams();
+    const selectedHomeworkId = searchParams.get("homeworkId") ? +searchParams.get("homeworkId")! : undefined
 
     const [state, setState] = useState<ICourseExperimentalState>({
         initialEditMode: false,
@@ -162,7 +161,7 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
 
     const taskSolutionsMap = new Map<number, Solution[]>()
 
-    if (!isMentor && isStudentAccepted) {
+    if (!isMentor && isAcceptedStudent) {
         studentSolutions
             .filter(t => t.id === userId)
             .flatMap(t => t.homeworks!)
@@ -340,10 +339,28 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
 
     const [newTaskCounter, setNewTaskCounter] = useState<number>(-1)
 
+    const handleHomeworkUpdate = (update: { homework: HomeworkViewModel, fileInfos?: FileInfoDTO[], isDeleted?: boolean }) => {
+        const { homework, isDeleted } = update;
+        if (isDeleted) {
+            dispatch(deleteHomework(homework.id!));
+        } else {
+            dispatch(updateOrInsertHomework(homework));
+        }
+    };
+
+    const handleTaskUpdate = (update: { task: HomeworkTaskViewModel, isDeleted?: boolean }) => {
+        const { task, isDeleted } = update;        
+        if (isDeleted) {
+            dispatch(deleteTask({homeworkId: task.homeworkId!, taskId: task.id!}));
+        } else {
+            dispatch(updateTask(task));
+        }
+    }
+
     const addNewHomework = () => {
-        props.onHomeworkUpdate({
+        handleHomeworkUpdate({
             homework: {
-                courseId: props.courseId,
+                courseId: courseId,
                 title: "Новое задание",
                 publicationDateNotSet: false,
                 publicationDate: undefined,
@@ -398,7 +415,7 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
             id
         }
 
-        props.onTaskUpdate({task})
+        handleTaskUpdate({task})
         setState((prevState) => ({
             ...prevState,
             selectedItem: {
@@ -418,14 +435,12 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
                 {isMentor && getDatesAlert(homework, true)}
                 <CourseHomeworkExperimental
                     key={homework.id}
-                    getAllHomeworks={() => homeworks}
                     homeworkAndFilesInfo={{homework, filesInfo}}
-                    isMentor={isMentor}
                     initialEditMode={initialEditMode || homeworkEditMode}
                     onMount={onSelectedItemMount}
                     onAddTask={addNewTask}
                     onUpdate={update => {
-                        props.onHomeworkUpdate(update)
+                        handleHomeworkUpdate(update)
                         setState((prevState) => ({
                             ...prevState,
                             selectedItem: {
@@ -434,7 +449,6 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
                             }
                         }))
                     }}
-                    isProcessing={props.processingFiles[homework.id!]?.isLoading || false}
                     onStartProcessing={(homeworkId: number, previouslyExistingFilesCount: number, waitingNewFilesCount: number, deletingFilesIds: number[]) =>
                         props.onStartProcessing(homeworkId, previouslyExistingFilesCount, waitingNewFilesCount, deletingFilesIds)}
                 />
@@ -450,11 +464,10 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
                 key={task.id}
                 task={task}
                 homework={homework!}
-                isMentor={isMentor}
                 initialEditMode={initialEditMode || taskEditMode}
                 onMount={onSelectedItemMount}
                 onUpdate={update => {
-                    props.onTaskUpdate(update)
+                    handleTaskUpdate(update)
                     if (update.isDeleted)
                         setState((prevState) => ({
                             ...prevState,
@@ -464,8 +477,8 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
                             }
                         }))
                 }}
-                toEditHomework={() => toEditHomework(homework!)} getAllHomeworks={() => homeworks}/>
-            {!props.isMentor && props.isStudentAccepted && < CardActions>
+                toEditHomework={() => toEditHomework(homework!)}/>
+            {!isMentor && isAcceptedStudent && < CardActions>
                 <Link
                     style={{color: '#212529'}}
                     to={"/task/" + task.id!.toString()}>
@@ -516,7 +529,7 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
                               borderRadius: 10
                           }
                       }}>
-                {props.isMentor && filterAdded && <Stack direction={"column"} alignItems={"center"}>
+                {isMentor && filterAdded && <Stack direction={"column"} alignItems={"center"}>
                     <Button
                         fullWidth
                         onClick={() => {
@@ -534,7 +547,7 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
                             : ""}
                     </Typography>
                 </Stack>}
-                {props.isMentor && !filterAdded && (homeworks[0]?.id || 1) > 0 && <Button
+                {isMentor && !filterAdded && (homeworks[0]?.id || 1) > 0 && <Button
                     onClick={addNewHomework}
                     style={{borderRadius: 8, marginBottom: 10}} variant={"text"} size={"small"}>
                     + Добавить задание
diff --git a/hwproj.front/src/components/Courses/NewCourseStudents.tsx b/hwproj.front/src/components/Courses/NewCourseStudents.tsx
index a5a028513..9efa948ce 100644
--- a/hwproj.front/src/components/Courses/NewCourseStudents.tsx
+++ b/hwproj.front/src/components/Courses/NewCourseStudents.tsx
@@ -1,29 +1,26 @@
 import * as React from 'react';
-import {AccountDataDto, CourseViewModel} from '../../api/';
 import ApiSingleton from "../../api/ApiSingleton";
 import {FC} from "react";
 import {Card, CardContent, CardActions, Grid, Button, Typography, Alert, AlertTitle} from '@mui/material';
+import {useAppSelector, useAppDispatch} from "@/store/hooks";
+import {fetchCourseData} from '@/store/slices/courseSlice';
 
-interface INewCourseStudentsProps {
-    course: CourseViewModel,
-    students: AccountDataDto[],
-    onUpdate: () => void,
-    courseId: string,
-}
-
-const NewCourseStudents: FC<INewCourseStudentsProps> = (props) => {
+const NewCourseStudents: FC = () => {
+    const course = useAppSelector(state => state.course.course);
+    const students = useAppSelector(state => state.course.newStudents);
+    const dispatch = useAppDispatch();
 
     const acceptStudent = async (studentId: string) => {
-        await ApiSingleton.coursesApi.coursesAcceptStudent(props.course.id!, studentId)
-        props.onUpdate()
+        await ApiSingleton.coursesApi.coursesAcceptStudent(course?.id!, studentId)
+        dispatch(fetchCourseData(course?.id!));
     }
 
     const rejectStudent = async (studentId: string) => {
-        await ApiSingleton.coursesApi.coursesRejectStudent(props.course.id!, studentId)
-        props.onUpdate()
+        await ApiSingleton.coursesApi.coursesRejectStudent(course?.id!, studentId)
+        dispatch(fetchCourseData(course?.id!));
     }
 
-    const studentsLength = props.students.length
+    const studentsLength = students.length
 
     if (studentsLength === 0) {
         return (
@@ -36,7 +33,7 @@ const NewCourseStudents: FC<INewCourseStudentsProps> = (props) => {
         )
     }
     return <Grid item container spacing={1} direction={"row"} xs={"auto"}>
-        {props.students.map((cm, i) => (
+        {students.map((cm, i) => (
             <Grid item>
                 <Card variant="elevation" style={{backgroundColor: "ghostwhite"}}>
                     <CardContent>
diff --git a/hwproj.front/src/components/Courses/Statistics/LecturerStatistics.tsx b/hwproj.front/src/components/Courses/Statistics/LecturerStatistics.tsx
index 349e130ea..d5666bef7 100644
--- a/hwproj.front/src/components/Courses/Statistics/LecturerStatistics.tsx
+++ b/hwproj.front/src/components/Courses/Statistics/LecturerStatistics.tsx
@@ -4,18 +4,20 @@ import ApiSingleton from "../../../api/ApiSingleton";
 import {Dialog, DialogContent, DialogTitle, Typography, Grid, Tooltip, Chip} from "@mui/material";
 import * as React from "react";
 import {DotLottieReact} from "@lottiefiles/dotlottie-react";
+import { useAppSelector } from "@/store/hooks";
 
 const LecturerStatistics: FC<{
-    courseId: number
     onClose: () => void
 }> = (props) => {
 
+    const courseId = useAppSelector(state => state.course.course?.id);
+
     const [isLoading, setIsLoading] = useState(true);
     const [statistics, setStatistics] = useState<StatisticsLecturersModel[]>([])
 
     const getStatistics = async () => {
         const statistics: StatisticsLecturersModel[] =
-            await ApiSingleton.statisticsApi.statisticsGetLecturersStatistics(props.courseId)
+            await ApiSingleton.statisticsApi.statisticsGetLecturersStatistics(courseId!);
         setStatistics(statistics)
         setIsLoading(false);
     }
diff --git a/hwproj.front/src/components/Courses/StudentStats.tsx b/hwproj.front/src/components/Courses/StudentStats.tsx
index 8a31c9ae3..1e5559b98 100644
--- a/hwproj.front/src/components/Courses/StudentStats.tsx
+++ b/hwproj.front/src/components/Courses/StudentStats.tsx
@@ -1,5 +1,5 @@
 import React, {useEffect, useState, useRef} from "react";
-import {CourseViewModel, HomeworkViewModel, StatisticsCourseMatesModel} from "@/api";
+import {HomeworkViewModel} from "@/api";
 import {useNavigate, useParams} from 'react-router-dom';
 import {LinearProgress, Table, TableBody, TableCell, TableContainer, TableHead, TableRow} from "@material-ui/core";
 import StudentStatsCell from "../Tasks/StudentStatsCell";
@@ -9,17 +9,10 @@ import StudentStatsUtils from "../../services/StudentStatsUtils";
 import ShowChartIcon from "@mui/icons-material/ShowChart";
 import {BonusTag, DefaultTags, TestTag} from "../Common/HomeworkTags";
 import Lodash from "lodash"
-import ApiSingleton from "@/api/ApiSingleton";
 import FullscreenIcon from '@mui/icons-material/Fullscreen';
 import FullscreenExitIcon from '@mui/icons-material/FullscreenExit';
+import {useAppSelector} from "@/store/hooks";
 
-interface IStudentStatsProps {
-    course: CourseViewModel;
-    homeworks: HomeworkViewModel[];
-    isMentor: boolean;
-    userId: string;
-    solutions: StatisticsCourseMatesModel[] | undefined;
-}
 
 interface IStudentStatsState {
     searched: string
@@ -27,12 +20,21 @@ interface IStudentStatsState {
 
 const greyBorder = grey[300]
 
-const StudentStats: React.FC<IStudentStatsProps> = (props) => {
+const StudentStats: React.FC = () => {
     const [state, setSearched] = useState<IStudentStatsState>({
         searched: ""
     });
     const {courseId} = useParams();
     const navigate = useNavigate();
+
+    const course = useAppSelector(state => state.course.course);
+    const allHomeworks = useAppSelector(state => state.homeworks.homeworks);
+    const studentSolutions = useAppSelector(state => state.solutions.studentSolutions);
+    const userId = useAppSelector(state => state.auth.userId);
+    const isLecturer = useAppSelector(state => state.auth.isLecturer);
+    const isExpert = useAppSelector(state => state.auth.isExpert);
+    const isMentor = isLecturer || isExpert;
+
     const handleClick = () => {
         navigate(`/statistics/${courseId}/charts`)
     }
@@ -62,7 +64,6 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
     }, [])
 
     const {searched} = state
-    const isMentor = ApiSingleton.authService.isMentor()
 
     useEffect(() => {
         const keyDownHandler = (event: KeyboardEvent) => {
@@ -82,10 +83,10 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
         return () => document.removeEventListener('keydown', keyDownHandler);
     }, [searched]);
 
-    const homeworks = props.homeworks.filter(h => h.tasks && h.tasks.length > 0)
+    const homeworks = allHomeworks.filter(h => h.tasks && h.tasks.length > 0)
     const solutions = searched
-        ? props.solutions?.filter(cm => (cm.surname + " " + cm.name).toLowerCase().includes(searched.toLowerCase()))
-        : props.solutions
+        ? studentSolutions?.filter(cm => (cm.surname + " " + cm.name).toLowerCase().includes(searched.toLowerCase()))
+        : studentSolutions
 
     const borderStyle = `1px solid ${greyBorder}`
     const testHomeworkStyle = {
@@ -129,10 +130,10 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
     const showBestSolutions = isMentor && (hasHomeworks || hasTests)
 
     const bestTaskSolutions = new Map<number, string>()
-    if (props.solutions && isMentor) {
+    if (studentSolutions && isMentor) {
         Lodash(homeworks)
             .flatMap(h => h.tasks!)
-            .map(t => props.solutions!
+            .map(t => studentSolutions
                 .map(s => s.homeworks!
                     .flatMap(h1 => h1.tasks!)
                     .find(t1 => t1.id === t.id)?.solution || [])
@@ -149,8 +150,8 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
 
     return (
         <div>
-            {props.solutions === undefined && <LinearProgress/>}
-            {props.solutions && props.solutions.length === 0 && <Alert severity="info">
+            {studentSolutions === undefined && <LinearProgress/>}
+            {studentSolutions && studentSolutions.length === 0 && <Alert severity="info">
                 На курс пока ещё никто не записался
             </Alert>}
             {searched &&
@@ -299,7 +300,7 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
                                             }}
                                         >
                                             {cm.reviewers && cm.reviewers
-                                                .filter(r => r.userId !== props.userId)
+                                                .filter(r => r.userId !== userId)
                                                 .map(r => `${r.name} ${r.surname}`)
                                                 .join(', ')}
                                         </Typography>
@@ -360,8 +361,8 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
                                                 solutions={cm.homeworks
                                                     ?.find(h => h.id === homework.id)?.tasks
                                                     ?.find(t => t.id === task.id)?.solution || []}
-                                                userId={props.userId}
-                                                forMentor={props.isMentor}
+                                                userId={userId!}
+                                                forMentor={isMentor}
                                                 studentId={String(cm.id)}
                                                 taskId={task.id!}
                                                 taskMaxRating={task.maxRating!}
diff --git a/hwproj.front/src/components/Homeworks/CourseHomeworkExperimental.tsx b/hwproj.front/src/components/Homeworks/CourseHomeworkExperimental.tsx
index bf29b0755..103847603 100644
--- a/hwproj.front/src/components/Homeworks/CourseHomeworkExperimental.tsx
+++ b/hwproj.front/src/components/Homeworks/CourseHomeworkExperimental.tsx
@@ -26,7 +26,6 @@ import {
 } from "@/api";
 import ApiSingleton from "../../api/ApiSingleton";
 import Tags from "../Common/Tags";
-import apiSingleton from "../../api/ApiSingleton";
 import FilesUploader from "../Files/FilesUploader";
 import PublicationAndDeadlineDates from "../Common/PublicationAndDeadlineDates";
 import * as React from "react";
@@ -42,6 +41,7 @@ import {BonusTag, DefaultTags, isBonusWork, isTestWork, TestTag} from "@/compone
 import Lodash from "lodash";
 import {CourseUnitType} from "../Files/CourseUnitType"
 import ProcessFilesUtils from "../Utils/ProcessFilesUtils";
+import {useAppSelector} from "@/store/hooks";
 
 export interface HomeworkAndFilesInfo {
     homework: HomeworkViewModel & { isModified?: boolean },
@@ -64,7 +64,6 @@ interface IEditFilesState {
 
 const CourseHomeworkEditor: FC<{
     homeworkAndFilesInfo: HomeworkAndFilesInfo,
-    getAllHomeworks: () => HomeworkViewModel[],
     onUpdate: (update: { homework: HomeworkViewModel, fileInfos: FileInfoDTO[] | undefined } & {
         isDeleted?: boolean,
         isSaved?: boolean
@@ -73,6 +72,7 @@ const CourseHomeworkEditor: FC<{
 }> = (props) => {
     const homework = props.homeworkAndFilesInfo.homework
     const isNewHomework = homework.id! < 0
+    const homeworks = useAppSelector(state => state.homeworks.homeworks);
 
     const [homeworkData, setHomeworkData] = useState<{
         loadedHomework: HomeworkViewModel,
@@ -139,7 +139,7 @@ const CourseHomeworkEditor: FC<{
         const isTest = tags.includes(TestTag)
         const isBonus = tags.includes(BonusTag)
 
-        const dateCandidate = Lodash(props.getAllHomeworks()
+        const dateCandidate = Lodash(homeworks
             .filter(x => {
                 const xIsTest = isTestWork(x)
                 const xIsBonus = isBonusWork(x)
@@ -285,7 +285,7 @@ const CourseHomeworkEditor: FC<{
 
         if (deletingFileIds.length === 0 && newFiles.length === 0) {
             if (isNewHomework) props.onUpdate({
-                homework: update,
+                homework: homework,
                 fileInfos: [],
                 isDeleted: true
             }) // remove fake homework
@@ -297,7 +297,7 @@ const CourseHomeworkEditor: FC<{
         } else {
             try {
                 if (isNewHomework) props.onUpdate({
-                    homework: update,
+                    homework: homework,
                     fileInfos: [],
                     isDeleted: true
                 }) // remove fake homework
@@ -307,7 +307,7 @@ const CourseHomeworkEditor: FC<{
                 const responseErrors = await ErrorsHandler.getErrorMessages(e as Response)
                 enqueueSnackbar(responseErrors[0], {variant: "warning", autoHideDuration: 4000});
                 if (isNewHomework) props.onUpdate({
-                    homework: update,
+                    homework: homework,
                     fileInfos: [],
                     isDeleted: true
                 }) // remove fake homework
@@ -346,7 +346,7 @@ const CourseHomeworkEditor: FC<{
                 <Grid item xs={6} style={{marginTop: 6}}>
                     <Tags tags={tags} onTagsChange={setTags} isElementSmall={false}
                           suggestion={tagSuggestion}
-                          requestTags={() => apiSingleton.coursesApi.coursesGetAllTagsForCourse(courseId)}/>
+                          requestTags={() => ApiSingleton.coursesApi.coursesGetAllTagsForCourse(courseId)}/>
                 </Grid>
             </Grid>
             <Grid container>
@@ -443,17 +443,19 @@ const CourseHomeworkEditor: FC<{
 
 const CourseHomeworkExperimental: FC<{
     homeworkAndFilesInfo: HomeworkAndFilesInfo,
-    getAllHomeworks: () => HomeworkViewModel[],
-    isMentor: boolean,
     initialEditMode: boolean,
     onMount: () => void,
     onUpdate: (x: { homework: HomeworkViewModel, fileInfos: FileInfoDTO[] | undefined } & {
         isDeleted?: boolean
     }) => void
     onAddTask: (homework: HomeworkViewModel) => void,
-    isProcessing: boolean;
     onStartProcessing: (homeworkId: number, previouslyExistingFilesCount: number, waitingNewFilesCount: number, deletingFilesIds: number[]) => void;
 }> = (props) => {
+    const mentors = useAppSelector(state => state.course.mentors);
+    const userId = useAppSelector(state => state.auth.userId);
+    const isMentor = mentors.some(m => m.userId === userId);
+    const processingFilesState = useAppSelector(state => state.courseFiles.processingFilesState);
+
     const {homework, filesInfo} = props.homeworkAndFilesInfo
     const deferredTasks = homework.tasks!.filter(t => t.isDeferred!)
     const tasksCount = homework.tasks!.length
@@ -466,7 +468,6 @@ const CourseHomeworkExperimental: FC<{
     }, [homework.id])
 
     if (editMode) return <CourseHomeworkEditor
-        getAllHomeworks={props.getAllHomeworks}
         homeworkAndFilesInfo={{homework, filesInfo}}
         onUpdate={update => {
             if (update.isSaved) setEditMode(false)
@@ -476,7 +477,7 @@ const CourseHomeworkExperimental: FC<{
     />
 
     return <CardContent
-        onMouseEnter={() => setShowEditMode(props.isMentor)}
+        onMouseEnter={() => setShowEditMode(isMentor)}
         onMouseLeave={() => setShowEditMode(false)}>
         <Grid xs={12} container direction={"row"} alignItems={"start"} alignContent={"center"}
               justifyContent={"space-between"}>
@@ -520,7 +521,7 @@ const CourseHomeworkExperimental: FC<{
         <Typography component="div" style={{color: "#454545"}} gutterBottom variant="body1">
             <MarkdownPreview value={homework.description!}/>
         </Typography>
-        {props.isProcessing ? (
+        {processingFilesState[homework.id!]?.isLoading ? (
             <div style={{display: 'flex', alignItems: 'center', color: '#1976d2', fontWeight: '500'}}>
                 <CircularProgress size="20px"/>
                 &nbsp;&nbsp;Обрабатываем файлы...
@@ -528,7 +529,7 @@ const CourseHomeworkExperimental: FC<{
         ) : filesInfo.length > 0 && (
             <div>
                 <FilesPreviewList
-                    showOkStatus={props.isMentor}
+                    showOkStatus={isMentor}
                     filesInfo={filesInfo}
                     onClickFileInfo={async (fileInfo: IFileInfo) => {
                         const url = await ApiSingleton.customFilesApi.getDownloadFileLink(fileInfo.id!)
diff --git a/hwproj.front/src/components/Tasks/CourseTaskExperimental.tsx b/hwproj.front/src/components/Tasks/CourseTaskExperimental.tsx
index 43f3636dc..94cfde35a 100644
--- a/hwproj.front/src/components/Tasks/CourseTaskExperimental.tsx
+++ b/hwproj.front/src/components/Tasks/CourseTaskExperimental.tsx
@@ -23,13 +23,13 @@ import {LoadingButton} from "@mui/lab";
 import TaskPublicationAndDeadlineDates from "../Common/TaskPublicationAndDeadlineDates";
 import DeletionConfirmation from "../DeletionConfirmation";
 import ActionOptionsUI from "../Common/ActionOptions";
+import {useAppSelector} from "@/store/hooks";
 import {Stack} from "@mui/material";
 import CloseIcon from "@mui/icons-material/Close";
 import Collapse from "@mui/material/Collapse";
 import ExpandLessIcon from "@mui/icons-material/ExpandLess";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 
-
 interface IEditTaskMetadataState {
     hasDeadline: boolean | undefined;
     deadlineDate: Date | undefined;
@@ -49,7 +49,6 @@ const CourseTaskEditor: FC<{
     speculativeTask: TaskEditData,
     speculativeHomework: HomeworkViewModel,
     onUpdate: (update: { task: TaskEditData, isDeleted?: boolean, isSaved?: boolean }) => void,
-    getAllHomeworks: () => HomeworkViewModel[],
     toEditHomework: () => void,
 }> = (props) => {
     const [taskData, setTaskData] = useState<{
@@ -468,13 +467,15 @@ const CourseTaskEditor: FC<{
 const CourseTaskExperimental: FC<{
     task: TaskEditData,
     homework: HomeworkViewModel,
-    isMentor: boolean,
     initialEditMode: boolean,
     onMount: () => void,
     onUpdate: (x: { task: TaskEditData, isDeleted?: boolean }) => void
     toEditHomework: () => void,
-    getAllHomeworks: () => HomeworkViewModel[],
 }> = (props) => {
+    const mentors = useAppSelector(state => state.course.mentors);
+    const userId = useAppSelector(state => state.auth.userId);
+    const isMentor = mentors.some(m => m.userId === userId);
+
     const {task, homework} = props
     const [showEditMode, setShowEditMode] = useState(false)
     const [editMode, setEditMode] = useState(false)
@@ -501,14 +502,13 @@ const CourseTaskExperimental: FC<{
                 props.onUpdate(updateFix)
                 if (update.isSaved) setEditMode(false)
             }}
-            getAllHomeworks={props.getAllHomeworks}
             toEditHomework={props.toEditHomework}
         />
     }
 
     return (
         <CardContent
-            onMouseEnter={() => setShowEditMode(props.isMentor)}
+            onMouseEnter={() => setShowEditMode(isMentor)}
             onMouseLeave={() => setShowEditMode(false)}
         >
             <Grid xs={12} container direction={"row"} alignItems={"center"} alignContent={"center"}
diff --git a/hwproj.front/src/index.tsx b/hwproj.front/src/index.tsx
index f63d3e5db..3e813aefa 100644
--- a/hwproj.front/src/index.tsx
+++ b/hwproj.front/src/index.tsx
@@ -8,6 +8,8 @@ import {BrowserRouter} from "react-router-dom";
 import ThemeProvider from "@material-ui/styles/ThemeProvider";
 import {createTheme} from "@material-ui/core/styles";
 import {SnackbarProvider} from "notistack";
+import { Provider } from "react-redux";
+import { store } from "./store";
 
 const theme = createTheme({
     typography: {
@@ -22,13 +24,15 @@ const theme = createTheme({
 });
 
 ReactDOM.render(
-    <ThemeProvider theme={theme}>
-        <SnackbarProvider maxSnack={3}>
-            <BrowserRouter>
-                <App/>
-            </BrowserRouter>
-        </SnackbarProvider>
-    </ThemeProvider>,
+    <Provider store={store}>
+        <ThemeProvider theme={theme}>
+            <SnackbarProvider maxSnack={3}>
+                <BrowserRouter>
+                    <App/>
+                </BrowserRouter>
+            </SnackbarProvider>
+        </ThemeProvider>
+    </Provider>,
     document.getElementById("root")
 );
 
diff --git a/hwproj.front/src/store/hooks.ts b/hwproj.front/src/store/hooks.ts
new file mode 100644
index 000000000..753d94ac6
--- /dev/null
+++ b/hwproj.front/src/store/hooks.ts
@@ -0,0 +1,5 @@
+import {useDispatch, useSelector} from 'react-redux';
+import type {RootState, AppDispatch} from './index';
+
+export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
+export const useAppSelector = useSelector.withTypes<RootState>();
\ No newline at end of file
diff --git a/hwproj.front/src/store/index.ts b/hwproj.front/src/store/index.ts
new file mode 100644
index 000000000..63ea8b163
--- /dev/null
+++ b/hwproj.front/src/store/index.ts
@@ -0,0 +1,19 @@
+import {configureStore} from '@reduxjs/toolkit';
+import courseReducer from './slices/courseSlice';
+import homeworkReducer from './slices/homeworkSlice';
+import solutionsReducer from './slices/solutionSlice';
+import courseFilesReducer from './slices/courseFileSlice';
+import authReducer from './slices/authSlice';
+
+export const store = configureStore({
+  reducer: {
+    course: courseReducer,
+    homeworks: homeworkReducer,
+    solutions: solutionsReducer,
+    courseFiles: courseFilesReducer,
+    auth: authReducer,
+  },
+});
+
+export type RootState = ReturnType<typeof store.getState>;
+export type AppDispatch = typeof store.dispatch;
\ No newline at end of file
diff --git a/hwproj.front/src/store/slices/authSlice.ts b/hwproj.front/src/store/slices/authSlice.ts
new file mode 100644
index 000000000..97f9b2aad
--- /dev/null
+++ b/hwproj.front/src/store/slices/authSlice.ts
@@ -0,0 +1,37 @@
+import {createSlice, PayloadAction} from '@reduxjs/toolkit';
+
+interface AuthState {
+    userId: string | null;
+    isLecturer: boolean;
+    isExpert: boolean;
+}
+
+const initialState: AuthState = {
+    userId: null,
+    isLecturer: false,
+    isExpert: false,
+};
+
+const authSlice = createSlice({
+    name: 'auth',
+    initialState,
+    reducers: {
+        setAuth: (state, action: PayloadAction<AuthState>) => {
+            state.userId = action.payload.userId;
+            state.isLecturer = action.payload.isLecturer;
+            state.isExpert = action.payload.isExpert;
+        },
+        
+        clearAuth: (state) => {
+            state.userId = null;
+            state.isLecturer = false;
+            state.isExpert = false;
+        },
+    },
+});
+
+export const { setAuth, 
+    clearAuth
+ } = authSlice.actions;
+ 
+export default authSlice.reducer;
\ No newline at end of file
diff --git a/hwproj.front/src/store/slices/courseFileSlice.ts b/hwproj.front/src/store/slices/courseFileSlice.ts
new file mode 100644
index 000000000..e26bec0a8
--- /dev/null
+++ b/hwproj.front/src/store/slices/courseFileSlice.ts
@@ -0,0 +1,57 @@
+import {createSlice, PayloadAction} from "@reduxjs/toolkit";
+import {FileInfoDTO} from "@/api";
+import {CourseUnitType} from "@/components/Files/CourseUnitType";
+
+interface ProcessingState {
+    isLoading: boolean;
+}
+
+interface CourseFilesState {
+    courseFiles: FileInfoDTO[];
+    processingFilesState: Record<number, ProcessingState>;
+}
+
+const initialState: CourseFilesState = {
+    courseFiles: [],
+    processingFilesState: {},
+}
+
+const courseFilesSlice = createSlice({
+    name: "courseFiles",
+    initialState,
+    reducers: {
+        setCourseFiles(state, action: PayloadAction<FileInfoDTO[]>) {
+            state.courseFiles = action.payload;
+        },
+
+        updateCourseFiles(state, action: PayloadAction<{
+            files: FileInfoDTO[];
+            unitType: CourseUnitType;
+            unitId: number;
+        }>) {
+            const { files, unitType, unitId } = action.payload;
+            state.courseFiles = [
+                ...state.courseFiles.filter(f => !(f.courseUnitType === unitType && f.courseUnitId === unitId)),
+                ...files
+            ];
+        },
+
+        setProcessingLoading(state, action: PayloadAction<{ homeworkId: number; isLoading: boolean }>) {
+            const { homeworkId, isLoading } = action.payload;
+            state.processingFilesState[homeworkId] = { isLoading };
+        },
+
+        clearCourseFiles(state) {
+            state.courseFiles = [];
+            state.processingFilesState = {};
+        },
+    },
+})
+
+export const { setCourseFiles, 
+    updateCourseFiles, 
+    setProcessingLoading, 
+    clearCourseFiles 
+} = courseFilesSlice.actions;
+
+export default courseFilesSlice.reducer;
\ No newline at end of file
diff --git a/hwproj.front/src/store/slices/courseSlice.ts b/hwproj.front/src/store/slices/courseSlice.ts
new file mode 100644
index 000000000..4d7749e6f
--- /dev/null
+++ b/hwproj.front/src/store/slices/courseSlice.ts
@@ -0,0 +1,84 @@
+import {createSlice, PayloadAction, createAsyncThunk} from '@reduxjs/toolkit';
+import {AccountDataDto, CourseViewModel} from '@/api'
+import ApiSingleton from '@/api/ApiSingleton';
+import {setHomeworks} from './homeworkSlice';
+
+export const fetchCourseData = createAsyncThunk(
+  'course/fetchCourseData',
+  async (courseId: number, {dispatch}) => {
+    const course = await ApiSingleton.coursesApi.coursesGetCourseData(courseId);
+    dispatch(setCourse(course));
+    dispatch(setMentors(course.mentors ?? []));
+    dispatch(setAcceptedStudents(course.acceptedStudents ?? []));
+    dispatch(setNewStudents(course.newStudents ?? []));
+    dispatch(setHomeworks(course.homeworks ?? []));
+
+    return course;
+  }
+);
+
+interface CourseState {
+  isFound: boolean;
+  isLoading: boolean;
+  course: CourseViewModel | null;
+  mentors: AccountDataDto[];
+  acceptedStudents: AccountDataDto[];
+  newStudents: AccountDataDto[];
+}
+
+const initialState: CourseState = {
+    isFound: false,
+    isLoading: false,
+    course: null,
+    mentors: [],
+    acceptedStudents: [],
+    newStudents: [],
+};
+
+const courseSlice = createSlice({
+  name: 'course',
+  initialState,
+  reducers: {
+    setCourse(state, action: PayloadAction<CourseViewModel>) {
+      state.course = action.payload;
+      state.isFound = true;
+      state.isLoading = false;
+    },
+
+    setMentors(state, action: PayloadAction<AccountDataDto[]>) {
+      state.mentors = action.payload;
+    },
+    
+    setAcceptedStudents(state, action: PayloadAction<AccountDataDto[]>) {
+        state.acceptedStudents = action.payload
+    },
+
+    setNewStudents(state, action: PayloadAction<AccountDataDto[]>) {
+        state.newStudents = action.payload
+    },
+
+    setLoading(state, action: PayloadAction<boolean>) {
+      state.isLoading = action.payload;
+    },
+
+    resetCourse(state) {
+      state.course = null;
+      state.isFound = false;
+      state.isLoading = false;
+      state.mentors = [];
+      state.acceptedStudents = [];
+      state.newStudents = [];
+    },
+  },
+});
+
+export const {
+  setCourse, 
+  setMentors, 
+  setAcceptedStudents, 
+  setNewStudents, 
+  setLoading, 
+  resetCourse
+} = courseSlice.actions;
+
+export default courseSlice.reducer;
\ No newline at end of file
diff --git a/hwproj.front/src/store/slices/homeworkSlice.ts b/hwproj.front/src/store/slices/homeworkSlice.ts
new file mode 100644
index 000000000..3e6481a3b
--- /dev/null
+++ b/hwproj.front/src/store/slices/homeworkSlice.ts
@@ -0,0 +1,78 @@
+import {createSlice, PayloadAction} from '@reduxjs/toolkit';
+import {HomeworkViewModel, HomeworkTaskViewModel} from '@/api';
+
+interface HomeworkState {
+    homeworks: HomeworkViewModel[];
+    isLoading: boolean
+}
+
+const initialState: HomeworkState = {
+    homeworks: [],
+    isLoading: false,
+}
+
+const homeworkSlice = createSlice({
+    name: 'homework',
+    initialState,
+    reducers: {
+        setHomeworks(state, action: PayloadAction<HomeworkViewModel[]>) {
+            state.homeworks = action.payload;
+            state.isLoading = false;
+        },
+        
+        deleteHomework(state, action: PayloadAction<number>) {
+            state.homeworks = state.homeworks.filter(hw => hw.id !== action.payload);
+        },
+
+        updateOrInsertHomework(state, action: PayloadAction<HomeworkViewModel>) {
+            const index = state.homeworks.findIndex(hw => hw.id === action.payload.id);
+            if (index !== -1) {
+                state.homeworks[index] = action.payload;
+            } else {
+                state.homeworks.push(action.payload);
+            }
+        },
+
+        updateTask(state, action: PayloadAction<HomeworkTaskViewModel>) {
+            const task = action.payload;
+            const homework = state.homeworks.find(hw => hw.id === task.homeworkId);
+            if (homework && homework.tasks) {
+                const taskIndex = homework.tasks.findIndex(t => t.id === task.id);
+                if (taskIndex !== -1) {
+                    homework.tasks[taskIndex] = task;
+                }
+                else {
+                    homework.tasks.push(task);
+                }
+            }
+        },
+
+        deleteTask(state, action: PayloadAction<{homeworkId: number, taskId: number}>) {
+            const homework = state.homeworks.find(hw => hw.id === action.payload.homeworkId);
+            if (homework && homework.tasks) {
+                homework.tasks = homework.tasks.filter(t => t.id !== action.payload.taskId);
+            }
+        },
+
+        setHomeworkLoading(state, action: PayloadAction<boolean>) {
+            state.isLoading = action.payload;
+        },
+
+        resetHomeworks(state) {
+            state.homeworks = [];
+            state.isLoading = false;
+        },
+    },
+});
+
+export const {
+    setHomeworks,
+    updateOrInsertHomework,
+    deleteHomework,
+    updateTask,
+    deleteTask,
+    setHomeworkLoading,
+    resetHomeworks,
+} = homeworkSlice.actions;
+
+export default homeworkSlice.reducer;
\ No newline at end of file
diff --git a/hwproj.front/src/store/slices/solutionSlice.ts b/hwproj.front/src/store/slices/solutionSlice.ts
new file mode 100644
index 000000000..d16cb3461
--- /dev/null
+++ b/hwproj.front/src/store/slices/solutionSlice.ts
@@ -0,0 +1,34 @@
+import {createSlice, PayloadAction} from "@reduxjs/toolkit";
+import {StatisticsCourseMatesModel} from '@/api';
+
+interface SolutionState {
+    studentSolutions: StatisticsCourseMatesModel[];
+    isLoaded: boolean;
+}
+
+const initialState: SolutionState = {
+    studentSolutions: [],
+    isLoaded: false,
+};
+
+const solutionSlice = createSlice({
+    name: "solution",
+    initialState,
+    reducers: {
+        setStudentSolutions(state, action: PayloadAction<StatisticsCourseMatesModel[]>) {
+            state.studentSolutions = action.payload;
+            state.isLoaded = true;
+        },
+        
+        clearStudentSolutions(state) {
+            state.studentSolutions = [];
+            state.isLoaded = false;
+        },
+    },
+});
+
+export const { setStudentSolutions, 
+    clearStudentSolutions 
+} = solutionSlice.actions;
+
+export default solutionSlice.reducer;
\ No newline at end of file