0.5.0

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "enterfront",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "enterfront",
-            "version": "0.4.0",
+            "version": "0.5.0",
             "dependencies": {
                 "@brojs/cli": "^1.0.0",
                 "@brojs/create": "^1.0.0",

package.json

@@ -29,5 +29,5 @@
         "clean": "rimraf dist"
     },
     "name": "enterfront",
-    "version": "0.4.0"
+    "version": "0.5.0"
 }

src/backend/api.js

@@ -1,10 +1,10 @@
 import {getConfigValue} from "@brojs/cli";
 
 
-const LOCAL = "http://localhost:8099" + getConfigValue("enterfront.api");
+const LOCAL = "http://localhost:8099";
-const DEV = "https://dev.bro-js.ru/ms/epja-2024-01/enterfront";
+const DEV = "https://dev.bro-js.ru";
 
-export const BASE_API_URL = DEV;
+export const BASE_API_URL = LOCAL + getConfigValue("enterfront.api");
 
 // fetch(`${BASE_API_URL}/books/list`)
 

src/pages/Chat.jsx

@@ -116,7 +116,12 @@ const Chat = () => {
   }, []);
 
   useEffect(() => {
-    retrieveMessages().then();
+    // retrieveMessages().then();
+    const interval = setInterval(() => {
+      retrieveMessages().then()
+    }, 2000);
+
+    return () => clearInterval(interval)
   }, [myId, interlocutorId]);
 
   useEffect(() => {

stubs/api/auth/index.js

@@ -3,8 +3,7 @@ const authRouter = require('express').Router();
 // For creating tokens
 const jwt = require('jsonwebtoken');
 
-require('dotenv').config();
+const { TOKEN_KEY } = require('../key')
-const TOKEN_KEY = process.env.TOKEN_KEY;
 
 
 module.exports = authRouter;
@@ -15,7 +14,6 @@ const { addUserToDB, getUserFromDB } = require('../db');
 // Get a user by its id
 authRouter.get('/:id', (req, res) => {
     const user = getUserFromDB(req.params.id);
-    console.log("Request get in /auth:", req.params.id);
 
     if (user) {
         res.status(200).send({user});
@@ -27,7 +25,6 @@ authRouter.get('/:id', (req, res) => {
 // For login (authorization)
 authRouter.post('/login', (req, res) => {
     const { name, password } = req.body;
-    console.log("Request login in /auth:", name);
 
     const user = getUserFromDB(name);
 
@@ -54,7 +51,6 @@ authRouter.post('/login', (req, res) => {
 
 authRouter.post('/reg', (req, res) => {
     const { name, password, nickname } = req.body;
-    console.log("Request reg in /auth:", name);
 
     const user = getUserFromDB(name);
 

stubs/api/change/index.js

@@ -2,14 +2,11 @@ const changeRouter = require('express').Router();
 
 module.exports = changeRouter;
 
-const { users, getUserFromDB, deleteUserFromDB, addUserToDB } = require('../db');
+const { getUserFromDB, deleteUserFromDB, addUserToDB } = require('../db');
-
-const jwt = require("jsonwebtoken");
 
 
 changeRouter.post('/nickname', (req, res) => {
     const { id, newNickname } = req.body;
-    console.log("Request nickname in /change:", id);
 
     const user = getUserFromDB(id);
 
@@ -36,7 +33,6 @@ changeRouter.post('/nickname', (req, res) => {
 
 changeRouter.post('/password', (req, res) => {
     const { id, newPassword } = req.body;
-    console.log("Request password in /change:", id);
 
     const user = getUserFromDB(id);
 
@@ -62,7 +58,6 @@ changeRouter.post('/password', (req, res) => {
 
 changeRouter.delete('/:id', (req, res) => {
     const { id } = req.params;
-    console.log("Request delete in /change:", id);
 
     deleteUserFromDB(id);
 });

stubs/api/chat/index.js

@@ -7,7 +7,6 @@ const { getChatFromDB, getUsersChats, addChatToDB, getUserFromDB,
 
 chatRouter.get('/item/:id1/:id2', (req, res) => {
     const { id1, id2 } = req.params;
-    console.log("Request get in /chat:", id1, id2);
 
     if (id1 === id2) {
         res.status(400).send({message: 'Ids should be different'});
@@ -25,7 +24,6 @@ chatRouter.get('/item/:id1/:id2', (req, res) => {
 
 chatRouter.post('/item/:id1/:id2', (req, res) => {
     const { id1, id2 } = req.params;
-    console.log("Request post in /chat:", id1, id2);
 
     if (id1 === id2) {
         res.status(400).send({message: 'Ids should be different'});
@@ -58,8 +56,6 @@ chatRouter.post('/item/:id1/:id2', (req, res) => {
 chatRouter.get('/list/:id', (req, res) => {
     const { id } = req.params;
 
-    console.log("Request get /list in /chat:", id);
-
     const userChats = getUsersChats(id);
 
     if (!userChats) {
@@ -72,7 +68,6 @@ chatRouter.get('/list/:id', (req, res) => {
 chatRouter.post('/message/:sender/:receiver', (req, res) => {
     const { sender, receiver } = req.params;
     const { message } = req.body;
-    console.log("Request post /message in /chat:", sender, receiver, message);
 
     const chat = getChatFromDB(sender, receiver);
 

stubs/api/index.js

@@ -12,6 +12,6 @@ module.exports = router;
 // router.use(delay(300));
 // router.use('/books', delay, booksRouter);
 
-router.use('/enterfront/auth', authRouter);
+router.use('/auth', authRouter);
-router.use('/enterfront/change', verify, changeRouter);
+router.use('/change', verify, changeRouter);
-router.use('/enterfront/chat', verify, chatRouter)
+router.use('/chat', verify, chatRouter)

stubs/api/key.js

@@ -0,0 +1,3 @@
+const TOKEN_KEY = '5frv12e4few3r';
+
+module.exports = { TOKEN_KEY }

stubs/api/middlewares/verify.js

@@ -1,13 +1,12 @@
 const jwt = require('jsonwebtoken');
 
-require('dotenv').config();
+const { TOKEN_KEY } = require('../key')
-const TOKEN_KEY = process.env.TOKEN_KEY;
 
 function verifyToken(req, res, next) {
     const token = req.headers['authorization']?.split(' ')[1];
 
     if (!token) {
-        return res.status(403).send({ message: 'No token provided' });
+        return res.status(401).send({ message: 'No token provided' });
     }
 
     // Verify token