Тест доделан (почти)

Author: Gonerr

backend/server.js

@@ -6,7 +6,7 @@ const pool = require('./dbconfig');
 const Cookies = require("js-cookie");
 //создание сервера
 const app = express();
-const port = 5007;
+const port = 5009;
 
 //подключение к приложени.
 app.use(cookieParser());
@@ -31,24 +31,28 @@ app.post('/api/login', async (req, res) => {
             console.log('Login successful:', user);
 
             const myUserResult = await pool.query(
-                'SELECT user_id, login, fio FROM USERS.USERS WHERE login = $1 AND password = $2',
+                'SELECT * FROM USERS.USERS U JOIN USERS.ROLES R ON U.role_id = R.role_id WHERE login = $1 AND password = $2',
                 [login, password]
             );
             const myUser = myUserResult.rows[0];
             // Очистка всех куков
             res.clearCookie('user_id', { path: '/' });
             res.clearCookie('login', { path: '/' });
             res.clearCookie('fio', { path: '/' });
+            res.clearCookie('role_id', { path: '/' });
 
             // Установить новые куки, доступные на стороне клиента
             res.cookie('user_id', myUser.user_id, { path: '/' });
             res.cookie('login', myUser.login, { path: '/' });
             res.cookie('fio', myUser.fio, { path: '/' });
+            res.cookie('role_id', myUser.role_id, { path: '/' });
+
             // Вывод установленных cookies в консоль
             console.log('Cookies set:');
             console.log('user_id:', myUser.user_id);
             console.log('login:', myUser.login);
             console.log('fio:', myUser.fio);
+            console.log('role_id:', myUser.role_id);
 
             res.status(200).json({ success: true, user });
             //res.status(200).json({ message: 'Login successful', user });

craco.config.js

@@ -2,7 +2,7 @@ module.exports = {
   devServer: {
     proxy: {
       '/api': {
-        target: 'http://localhost:5007',
+        target: 'http://localhost:5009',
         changeOrigin: true,
       },
     },

node_modules/.cache/default-development/3.pack

@@ -25,7 +25,7 @@
     "eject": "craco eject",
     "deploy" : "npm run build&&gh-pages -d build"
   },
-  "proxy": "http://localhost:5007",
+  "proxy": "http://localhost:5009",
   "engines": {
     "node": "18.x"
   },

node_modules/.cache/default-development/4.pack

@@ -83,10 +83,19 @@ const TestComponent = ({ questions_ar, onTestResult, onEndTest, rootClassName })
             {questions_ar.map((question, index) => (
                 <div key={index} className="test-container-question">
                     <div className="test-container-text">{`Вопрос ${index + 1}`}</div>
+                    {resultData && (
+                        <div className={`answer-explanation ${resultData.correctAnswers[question.task_id][0] === userAnswers[index].answer
+                            ? 'green-text'
+                            : 'red-text'}`}>
+                            {resultData.correctAnswers[question.task_id][0] === userAnswers[index].answer
+                                ? 'Ответ правильный'
+                                : 'Ответ неверный'}
+                        </div>
+                    )}
                     <span className="test-container-text3">{question.task_text}</span>
                     <div className="test-container-answers">
                         {question.answers.map((answer, idx) => (
-                            <div key={idx} className={`test-container-answer ${getAnswerClass(index, idx,question.task_id, answer)}`}>
+                            <div key={idx} className={`test-container-answer`}>
                                 <input
                                     className="custom-radio"
                                     type="radio"
@@ -95,17 +104,12 @@ const TestComponent = ({ questions_ar, onTestResult, onEndTest, rootClassName })
                                     value={idx}
                                     disabled={!!resultData} // Блокируем изменение ответов после проверки
                                 />
-                                <label htmlFor={`q${index}a${idx}`}>{answer}</label>
+                                <label className={`${getAnswerClass(index, idx,question.task_id, answer)}`} htmlFor={`q${index}a${idx}`}>{answer}</label>
                             </div>
                         ))}
+
                     </div>
-                    {resultData && (
-                        <div className="answer-explanation">
-                            {resultData.correctAnswers[question.task_id][0] === userAnswers[index].answer
-                                ? 'Ответ правильный'
-                                : 'Ответ неверный'}
-                        </div>
-                    )}
+
                 </div>
             ))}
 

package.json

@@ -32,6 +32,8 @@ const Profile = (props) => {
                 } else {
                     console.error('Failed to fetch progress:', data.error);
                 }
+
+
             } catch (error) {
                 console.error('Error fetching progress:', error);
             }
@@ -65,8 +67,13 @@ const Profile = (props) => {
               onClick={handleLogout}
           />
 
-          {parseInt(Cookies.get('user_id'), 10)===1 ?  <AdminPanel/> : <Contact/>}
-
+          {parseInt(Cookies.get('role_id'), 10) === 3 ? (
+              <AdminPanel />
+          ) : parseInt(Cookies.get('role_id'), 10) === 1 ? (
+              <AdminPanel />
+          ) : (
+              <Contact />
+          )}
         <Footer rootClassName="footer-root-class-name1"></Footer>
       </div>
   )

src/components/layout/themeOutput/tasksPage/testLayout/testContainer/test-container.jsx

@@ -1,17 +1,22 @@
 .correct-answer {
-  background-color: #d4edda;
-  color: #155724;
+  /*background-color: #d4edda;*/
+  color: #13b335;
 }
 
 .incorrect-answer {
-  background-color: #f8d7da;
-  color: #721c24;
+  /*background-color: #f8d7da;*/
+  color: #cc0d1e;
 }
-
+/*.green-text{*/
+/*  color: #13b335;*/
+/*}*/
+/*.red-text{*/
+/*  color: #cc0d1e;*/
+/*}*/
 .answer-explanation {
-  margin-top: 10px;
+  margin: 15px 0px ;
   font-style: italic;
-  color: #333;
+  color: var(--dl-color-secondary-400);
 }
 
 .Correct-format{