fixed exit button

package-lock.json

@@ -1,16 +1,17 @@
 {
     "name": "enterfront",
-    "version": "0.3.0",
+    "version": "0.5.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "enterfront",
-            "version": "0.3.0",
+            "version": "0.5.4",
             "dependencies": {
                 "@brojs/cli": "^1.0.0",
                 "@brojs/create": "^1.0.0",
                 "@ijl/cli": "^5.1.0",
+                "@reduxjs/toolkit": "^2.3.0",
                 "@types/react": "^18.3.5",
                 "@types/react-dom": "^18.3.0",
                 "dotenv": "^16.4.5",
@@ -21,8 +22,11 @@
                 "react-dom": "^18.3.1",
                 "react-emoji-picker": "^1.0.13",
                 "react-icons": "^5.3.0",
+                "react-redux": "^9.1.2",
                 "react-router-dom": "^6.26.1",
                 "react-toastify": "^10.0.5",
+                "socket.io": "^4.8.0",
+                "socket.io-client": "^4.8.0",
                 "styled-components": "^6.1.13",
                 "typescript": "^5.5.4",
                 "ws": "^8.18.0"
@@ -1854,9 +1858,9 @@
             }
         },
         "node_modules/@brojs/cli/node_modules/i18next": {
-            "version": "23.15.1",
+            "version": "23.15.2",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.15.1.tgz",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.15.2.tgz",
-            "integrity": "sha512-wB4abZ3uK7EWodYisHl/asf8UYEhrI/vj/8aoSsrj/ZDxj4/UXPOa1KvFt1Fq5hkUHquNqwFlDprmjZ8iySgYA==",
+            "integrity": "sha512-zcPSWzCvw6uKnuYHIqs4W7hTuB9e3AFcSdZgvCWoPXIZsBjBd4djN2/2uOHIB+1DFFkQnMBXvhNg7J3WyCuywQ==",
             "funding": [
                 {
                     "type": "individual",
@@ -3055,6 +3059,40 @@
                 "node": ">=14"
             }
         },
+        "node_modules/@reduxjs/toolkit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.3.0.tgz",
+            "integrity": "sha512-WC7Yd6cNGfHx8zf+iu+Q1UPTfEcXhQ+ATi7CV1hlrSAaQBdlPzg7Ww/wJHNQem7qG9rxmWoFCDCPubSvFObGzA==",
+            "license": "MIT",
+            "dependencies": {
+                "immer": "^10.0.3",
+                "redux": "^5.0.1",
+                "redux-thunk": "^3.1.0",
+                "reselect": "^5.1.0"
+            },
+            "peerDependencies": {
+                "react": "^16.9.0 || ^17.0.0 || ^18",
+                "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "react": {
+                    "optional": true
+                },
+                "react-redux": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@reduxjs/toolkit/node_modules/immer": {
+            "version": "10.1.1",
+            "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+            "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+            "license": "MIT",
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/immer"
+            }
+        },
         "node_modules/@remix-run/router": {
             "version": "1.19.1",
             "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.1.tgz",
@@ -3071,12 +3109,14 @@
         "node_modules/@types/cookie": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-            "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="
+            "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
+            "license": "MIT"
         },
         "node_modules/@types/cors": {
             "version": "2.8.17",
             "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
             "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
+            "license": "MIT",
             "dependencies": {
                 "@types/node": "*"
             }
@@ -3170,6 +3210,12 @@
                 "source-map": "^0.6.1"
             }
         },
+        "node_modules/@types/use-sync-external-store": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
+            "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==",
+            "license": "MIT"
+        },
         "node_modules/@types/webpack": {
             "version": "4.41.39",
             "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.39.tgz",
@@ -3735,6 +3781,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
             "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+            "license": "MIT",
             "engines": {
                 "node": "^4.5.0 || >= 5.9"
             }
@@ -4364,6 +4411,7 @@
             "version": "2.8.5",
             "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
             "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+            "license": "MIT",
             "dependencies": {
                 "object-assign": "^4",
                 "vary": "^1"
@@ -4783,9 +4831,10 @@
             }
         },
         "node_modules/engine.io": {
-            "version": "6.5.5",
+            "version": "6.6.1",
-            "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz",
+            "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.1.tgz",
-            "integrity": "sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==",
+            "integrity": "sha512-NEpDCw9hrvBW+hVEOK4T7v0jFJ++KgtPl4jKFwsZVfG1XhS0dCrSb3VMb9gPAd7VAdW52VT1EnaNiU2vM8C0og==",
+            "license": "MIT",
             "dependencies": {
                 "@types/cookie": "^0.4.1",
                 "@types/cors": "^2.8.12",
@@ -4802,6 +4851,40 @@
                 "node": ">=10.2.0"
             }
         },
+        "node_modules/engine.io-client": {
+            "version": "6.6.1",
+            "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.1.tgz",
+            "integrity": "sha512-aYuoak7I+R83M/BBPIOs2to51BmFIpC1wZe6zZzMrT2llVsHy5cvcmdsJgP2Qz6smHu+sD9oexiSUAVd8OfBPw==",
+            "license": "MIT",
+            "dependencies": {
+                "@socket.io/component-emitter": "~3.1.0",
+                "debug": "~4.3.1",
+                "engine.io-parser": "~5.2.1",
+                "ws": "~8.17.1",
+                "xmlhttprequest-ssl": "~2.1.1"
+            }
+        },
+        "node_modules/engine.io-client/node_modules/ws": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+            "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": ">=5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/engine.io-parser": {
             "version": "5.2.3",
             "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
@@ -4814,6 +4897,7 @@
             "version": "0.4.2",
             "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
             "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
             }
@@ -8246,6 +8330,29 @@
             "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
             "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
         },
+        "node_modules/react-redux": {
+            "version": "9.1.2",
+            "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.1.2.tgz",
+            "integrity": "sha512-0OA4dhM1W48l3uzmv6B7TXPCGmokUU4p1M44DGN2/D9a1FjVPukVjER1PcPX97jIg6aUeLq1XJo1IpfbgULn0w==",
+            "license": "MIT",
+            "dependencies": {
+                "@types/use-sync-external-store": "^0.0.3",
+                "use-sync-external-store": "^1.0.0"
+            },
+            "peerDependencies": {
+                "@types/react": "^18.2.25",
+                "react": "^18.0",
+                "redux": "^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "redux": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/react-router": {
             "version": "6.26.1",
             "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.1.tgz",
@@ -8369,6 +8476,21 @@
                 "recursive-watch": "bin.js"
             }
         },
+        "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/regenerate": {
             "version": "1.4.2",
             "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -8477,6 +8599,12 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/reselect": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+            "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
+            "license": "MIT"
+        },
         "node_modules/resolve": {
             "version": "1.22.8",
             "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@@ -8959,15 +9087,16 @@
             }
         },
         "node_modules/socket.io": {
-            "version": "4.7.5",
+            "version": "4.8.0",
-            "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.5.tgz",
+            "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
-            "integrity": "sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==",
+            "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
+            "license": "MIT",
             "dependencies": {
                 "accepts": "~1.3.4",
                 "base64id": "~2.0.0",
                 "cors": "~2.8.5",
                 "debug": "~4.3.2",
-                "engine.io": "~6.5.2",
+                "engine.io": "~6.6.0",
                 "socket.io-adapter": "~2.5.2",
                 "socket.io-parser": "~4.2.4"
             },
@@ -9005,6 +9134,21 @@
                 }
             }
         },
+        "node_modules/socket.io-client": {
+            "version": "4.8.0",
+            "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.0.tgz",
+            "integrity": "sha512-C0jdhD5yQahMws9alf/yvtsMGTaIDBnZ8Rb5HU56svyq0l5LIrGzIDZZD5pHQlmzxLuU91Gz+VpQMKgCTNYtkw==",
+            "license": "MIT",
+            "dependencies": {
+                "@socket.io/component-emitter": "~3.1.0",
+                "debug": "~4.3.2",
+                "engine.io-client": "~6.6.1",
+                "socket.io-parser": "~4.2.4"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
         "node_modules/socket.io-parser": {
             "version": "4.2.4",
             "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
@@ -9771,6 +9915,15 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/use-sync-external-store": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz",
+            "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==",
+            "license": "MIT",
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            }
+        },
         "node_modules/util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -10147,6 +10300,14 @@
                 }
             }
         },
+        "node_modules/xmlhttprequest-ssl": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.1.tgz",
+            "integrity": "sha512-ptjR8YSJIXoA3Mbv5po7RtSYHO6mZr8s7i5VGmEk7QY2pQWyT1o0N+W1gKbOyJPUCGXGnuw0wqe8f0L6Y0ny7g==",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
         "node_modules/y18n": {
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",

package.json

@@ -3,6 +3,7 @@
         "@brojs/cli": "^1.0.0",
         "@brojs/create": "^1.0.0",
         "@ijl/cli": "^5.1.0",
+        "@reduxjs/toolkit": "^2.3.0",
         "@types/react": "^18.3.5",
         "@types/react-dom": "^18.3.0",
         "dotenv": "^16.4.5",
@@ -13,8 +14,11 @@
         "react-dom": "^18.3.1",
         "react-emoji-picker": "^1.0.13",
         "react-icons": "^5.3.0",
+        "react-redux": "^9.1.2",
         "react-router-dom": "^6.26.1",
         "react-toastify": "^10.0.5",
+        "socket.io": "^4.8.0",
+        "socket.io-client": "^4.8.0",
         "styled-components": "^6.1.13",
         "typescript": "^5.5.4",
         "ws": "^8.18.0"
@@ -27,5 +31,5 @@
         "clean": "rimraf dist"
     },
     "name": "enterfront",
-    "version": "0.3.0"
+    "version": "0.5.4"
 }

src/app.tsx

@@ -6,6 +6,9 @@ import { Dashboard } from './dashboard';
 import {ToastContainer} from "react-toastify";
 import 'react-toastify/dist/ReactToastify.css';
 
+import { Provider } from 'react-redux';
+import store from './backend/redux/store.js'; // Import your store
+
 
 import './index.css'
 import {displayMessage} from "./backend/notifications/notifications.js";
@@ -26,13 +29,13 @@ const App = () => {
     }, []);
 
   return(
-      <div>
+      <Provider store={store}>
           <BrowserRouter>
               <Dashboard />
           </BrowserRouter>
 
           <ToastContainer/>
-      </div>
+      </Provider>
 
   )
 }

src/backend/api.js

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

src/backend/chat-server.js

@@ -1,43 +0,0 @@
-const WebSocket = require("ws");
-const wss = new WebSocket.Server({ port: 8080 });
-
-const clients = new Map();
-
-wss.on("connection", (ws, req) => {
-  console.log("New client connected");
-
-  ws.on("message", (message) => {
-    try {
-      const parsedMessage = JSON.parse(message);
-      if (parsedMessage.type === "register") {
-        clients.set(parsedMessage.userId, ws);
-        console.log(`User registered: ${parsedMessage.userId}`);
-      } else if (parsedMessage.type === "message") {
-        const recipientWs = clients.get(parsedMessage.recipientId);
-        if (recipientWs) {
-          recipientWs.send(
-            JSON.stringify({
-              senderId: parsedMessage.senderId,
-              message: parsedMessage.message,
-              timestamp: new Date().toISOString(),
-            })
-          );
-        } else {
-          console.error(`User ${parsedMessage.recipientId} is not connected.`);
-        }
-      }
-    } catch (err) {
-      console.error("Error processing message:", err.message);
-    }
-  });
-
-  ws.on("close", () => {
-    console.log("Client disconnected");
-    [...clients.entries()].forEach(([userId, clientWs]) => {
-      if (clientWs === ws) {
-        clients.delete(userId);
-        console.log(`User disconnected: ${userId}`);
-      }
-    });
-  });
-});

src/backend/interlocutor/Interlocutor.js

@@ -1,8 +0,0 @@
-export default class Interlocutor {
-  constructor(id, name) {
-    this.name = name;
-    this.id = id;
-  }
-  static name;
-  static id;
-}

src/backend/redux/api_slice.js

@@ -0,0 +1,34 @@
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
+import {getConfigValue} from "@brojs/cli";
+
+import { BASE_API_URL } from "../api.js";
+
+const baseQuery = fetchBaseQuery({
+    baseUrl: BASE_API_URL,
+    prepareHeaders: (headers) => {
+        const token = localStorage.getItem('token');
+        if (token) {
+            headers.set('Authorization', `Bearer ${token}`);
+        }
+        return headers;
+    },
+});
+
+export const apiSlice = createApi({
+    reducerPath: 'api',
+    baseQuery,
+    endpoints: (builder) => ({
+        getChats: builder.query({
+            query: (username) => `/chat/list/${username}`,
+        }),
+        postChat: builder.mutation({
+            query: ({ id1, id2 }) => ({
+                url: `/chat/item/${id1}/${id2}`,
+                method: 'POST',
+            }),
+        }),
+    }),
+});
+
+// Export hooks for usage in functional components
+export const { useGetChatsQuery, usePostChatMutation } = apiSlice;

src/backend/redux/store.js

@@ -0,0 +1,12 @@
+import { configureStore } from '@reduxjs/toolkit';
+import { apiSlice } from './api_slice';
+
+const store = configureStore({
+    reducer: {
+        [apiSlice.reducerPath]: apiSlice.reducer,
+    },
+    middleware: (getDefaultMiddleware) =>
+        getDefaultMiddleware().concat(apiSlice.middleware),
+});
+
+export default store;

src/backend/server.js

@@ -0,0 +1,31 @@
+const express = require("express");
+const http = require("http");
+const { Server } = require("socket.io");
+require("dotenv").config();
+
+const app = express();
+const server = http.createServer(app);
+const io = new Server(server);
+
+io.on("connection", (socket) => {
+  console.log("New connection:", socket.id);
+
+  // For messages
+  socket.on("sendMessage", (message) => {
+    console.log("Message received:", message);
+    socket.broadcast.emit("receiveMessage", message);
+  });
+
+  socket.on("disconnect", () => {
+    console.log("User disconnected:", socket.id);
+  });
+});
+
+app.get("/", (req, res) => {
+  res.send("Socket.IO Server is running");
+});
+
+const PORT = process.env.PORT || 8099;
+server.listen(PORT, () => {
+  console.log(`Server is running on port ${PORT}`);
+});

src/backend/user/User.js

@@ -1,7 +0,0 @@
-export default class User {
-  constructor(id, name) {
-    this.id = id;
-    this.name = name;
-    this.status = "online";
-  }
-}

src/components/home/ChatsList.jsx

@@ -1,76 +1,92 @@
-import React, {useEffect, useState} from 'react';
+import React, { useEffect, useState } from "react";
 import Card from "./Card.jsx";
-import {get} from "../../backend/api";
+import { get } from "../../backend/api";
-import {displayMessage} from "../../backend/notifications/notifications";
+import { displayMessage } from "../../backend/notifications/notifications";
-import {MessageType} from "../../backend/notifications/message";
+import { MessageType } from "../../backend/notifications/message";
 
 const ChatsList = (props) => {
-    const { chats } = props;
+  const { chats } = props;
+  const [customChats, setCustomChats] = useState([]);
 
-    const [customChats, setCustomChats] = useState([]);
+  const updateList = async () => {
+    const username = localStorage.getItem("username");
+    if (!username) return null;
 
-    const updateList = async () => {
+    const updatedChats = await Promise.all(
-        const username = localStorage.getItem("username");
+      chats.map(async (chat) => {
-        if (!username) {return null;}
+        const interlocutorId = chat.id1 === username ? chat.id2 : chat.id1;
 
-        const updatedChats = await Promise.all(
+        const { ok, data } = await get("/auth/" + interlocutorId);
-            chats.map(async (chat) => {
+        if (!ok) {
-                const interlocutorId = chat.id1 === username ? chat.id2 : chat.id1
+          displayMessage(data.message, MessageType.ERROR);
+          return null;
+        }
 
-                const {ok, data} = await get('/auth/' + interlocutorId);
+        const interlocutor = data.user;
-                if (!ok) {
-                    displayMessage(data.message, MessageType.ERROR);
-                    return null;
-                }
 
-                const interlocutor = data.user;
+        const lastMessage =
+          chat.messages.length > 0
+            ? chat.messages[chat.messages.length - 1]
+            : { data: "", timestamp: new Date(0).toISOString() };
 
-                return {
+        return {
-                    id: interlocutorId,
+          id: interlocutorId,
-                    name: interlocutor.nickname,
+          name: interlocutor.nickname,
-                    lastMessage: chat.messages.length > 0 ? chat.messages[chat.messages.length - 1].data : "",
+          lastMessageData: lastMessage.data,
-                }
+          lastMessageTimestamp: lastMessage.timestamp,
-            })
+        };
-        );
+      })
+    );
 
-        setCustomChats(updatedChats.filter(chat => chat !== null));
+    const validChats = updatedChats.filter((chat) => chat !== null);
-    };
 
-    useEffect(() => {updateList().then();}, [chats])
+    validChats.sort(
+      (a, b) =>
+        new Date(b.lastMessageTimestamp) - new Date(a.lastMessageTimestamp)
+    );
 
+    setCustomChats(validChats);
+  };
 
-    const colorMap = {
+  useEffect(() => {
-        orange: 'FFA500FF',
+    updateList().then();
-        aqua: '00FFFFFF',
+  }, [chats]);
-        crimson: 'DC143CFF',
-        red: 'FF0000FF',
-        violet: '8A2BE2FF',
-        seagreen: '20B2AAFF',
-        green: 'ADFF2FFF',
-        blue: '0000FFFF',
-        pink: 'FF1493FF',
-        cyan: '72FAFAFF'
-    }
 
-    function getColor(chatId) {
+  const colorMap = {
-        const keys = Object.keys(colorMap);
+    orange: "FFA500FF",
-        const numericId = Array.from(chatId).reduce((sum, char) => sum + char.charCodeAt(0), 0);
+    aqua: "00FFFFFF",
-        const index = numericId % keys.length;
+    crimson: "DC143CFF",
-        return colorMap[keys[index]];
+    red: "FF0000FF",
-    }
+    violet: "8A2BE2FF",
+    seagreen: "20B2AAFF",
+    green: "ADFF2FFF",
+    blue: "0000FFFF",
+    pink: "FF1493FF",
+    cyan: "72FAFAFF",
+  };
+
+  function getColor(chatId) {
+    const keys = Object.keys(colorMap);
+    const numericId = Array.from(chatId).reduce(
+      (sum, char) => sum + char.charCodeAt(0),
+      0
+    );
+    const index = numericId % keys.length;
+    return colorMap[keys[index]];
+  }
 
   return (
-      <div className="ChatsList">
+    <div className="ChatsList">
-          {customChats.map((item, index) => (
+      {customChats.map((item, index) => (
-              <Card
+        <Card
-                  key={index}
+          key={index}
-                  name={item.name}
+          name={item.name}
-                  lastMessage={item.lastMessage}
+          lastMessage={item.lastMessageData}
-                  id={item.id}
+          id={item.id}
-                  color={getColor(item.id)}
+          color={getColor(item.id)}
-              />
+        />
-          ))}
+      ))}
-      </div>
+    </div>
   );
 };
 

src/pages/Account.jsx

@@ -13,7 +13,7 @@ const Account = () => {
         localStorage.removeItem("token");
 
         localStorage.setItem("message", "Exited successfully!");
-        window.location.href = "/";
+        window.location.href = URLs.baseUrl;
     }
 
     const [nickname, setNickname] = useState("");

src/pages/Chat.jsx

@@ -2,9 +2,10 @@ import React, { useEffect, useState, useRef } from "react";
 import { useNavigate } from "react-router-dom";
 import "./css/Chat.css";
 import { FaPaperPlane, FaSmile } from "react-icons/fa";
-import {get, post} from "../backend/api";
+import { get, post } from "../backend/api";
-import {displayMessage} from "../backend/notifications/notifications";
+import { displayMessage } from "../backend/notifications/notifications";
-import {MessageType} from "../backend/notifications/message";
+import { MessageType } from "../backend/notifications/message";
+import io from "socket.io-client";
 
 const emojis = [
   "😀",
@@ -88,8 +89,7 @@ const Chat = () => {
   const [myId, setMyId] = useState("");
 
   useEffect(() => {
-    // const id = parseInt(localStorage.getItem("interlocutorId"), 10) || 0;
+    const id = localStorage.getItem("interlocutorId");
-    const id = localStorage.getItem("interlocutorId")
     setInterlocutorId(id);
 
     const username = localStorage.getItem("username");
@@ -100,36 +100,29 @@ const Chat = () => {
       return () => {};
     }
 
-    socket.current = new WebSocket("ws://localhost:8080");
+    socket.current = io("http://localhost:8099");
 
-    socket.current.onopen = () => {
+    socket.current.on("receiveMessage", (message) => {
-      console.log("WebSocket connected");
+      setMessages((prev) => [...prev, message]);
-      socket.current.send(
+    });
-        JSON.stringify({ type: "register", userId: "yourUserId" })
-      );
-    };
 
-    socket.current.onmessage = (event) => {
+    socket.current.on("connect_error", (err) => {
-      const receivedData = JSON.parse(event.data);
+      console.error("Connection Error:", err.message);
-      setMessages((prev) => [...prev, receivedData]);
+    });
-    };
-
-    socket.current.onerror = (event) => {
-      console.error("WebSocket error observed:", event);
-    };
-
-    socket.current.onclose = () => {
-      console.log("WebSocket closed");
-    };
 
     return () => {
-      socket.current.close();
+      socket.current.disconnect();
     };
   }, []);
 
   useEffect(() => {
-    retrieveMessages().then();
+    // retrieveMessages().then();
-  }, [myId, interlocutorId])
+    const interval = setInterval(() => {
+      retrieveMessages().then()
+    }, 2000);
+
+    return () => clearInterval(interval)
+  }, [myId, interlocutorId]);
 
   useEffect(() => {
     if (chatRef.current) {
@@ -137,25 +130,24 @@ const Chat = () => {
     }
   }, [messages]);
 
-  // The function for sending message to the DB
+  async function sendMessageToDB(messageData) {
-  async function sendMessageToDB (messageData) {
+    const { ok, data } = await post(
-    const { ok, data } = post('/chat/message/' + myId + '/' + interlocutorId, { message: messageData });
+      "/chat/message/" + myId + "/" + interlocutorId,
-
+      { message: messageData }
+    );
     if (!ok) {
       displayMessage(data.message, MessageType.ERROR);
     }
   }
 
-  // The function retrieves messages from the DB for the current chat
+  async function retrieveMessages() {
-  async function retrieveMessages () {
+    if (!myId || !interlocutorId) return;
-    if (!myId || !interlocutorId) {return;}
-    const { ok, data } = await get('/chat/item/' + myId + '/' + interlocutorId);
 
+    const { ok, data } = await get("/chat/item/" + myId + "/" + interlocutorId);
     if (!ok) {
       displayMessage(data.message, MessageType.ERROR);
       return;
     }
-
     setMessages(data.chat.messages);
   }
 
@@ -165,15 +157,11 @@ const Chat = () => {
         senderId: myId,
         recipientId: interlocutorId,
         data: newMessage,
-        timestamp: new Date().toLocaleTimeString(),
+        timestamp: new Date().toLocaleString(),
       };
-      socket.current.send(JSON.stringify(messageData));
+      socket.current.emit("sendMessage", messageData);
       setMessages((prev) => [...prev, messageData]);
-
       sendMessageToDB(messageData).then();
-
-      console.log('format:', messageData);
-
       setNewMessage("");
     }
   };
@@ -198,8 +186,7 @@ const Chat = () => {
           className="home-button"
         >
           Home
-        </button>{" "}
+        </button>
-        {}
       </div>
       <div className="chat-messages" ref={chatRef}>
         {messages.map((msg, index) => (
@@ -210,8 +197,7 @@ const Chat = () => {
             }`}
           >
             <div className="message-content">
-              <b>{msg.senderId === myId ? "You" : "They"}:</b>{" "}
+              <b>{msg.senderId === myId ? "You" : "They"}:</b> {msg.data}
-              {msg.data}
             </div>
             <span className="message-timestamp">{msg.timestamp}</span>
           </div>

src/pages/Home.jsx

@@ -1,77 +1,115 @@
-import React, {useEffect, useState} from "react";
+import React, { useEffect, useState } from "react";
 import HomeTitle from "../components/home/HomeTitle.jsx";
 import ChatsList from "../components/home/ChatsList.jsx";
 import Header from "../components/home/Header.jsx";
-import {displayMessage} from "../backend/notifications/notifications";
+import { displayMessage } from "../backend/notifications/notifications";
-import {MessageType} from "../backend/notifications/message";
+import { MessageType } from "../backend/notifications/message";
-import {get, post} from "../backend/api";
+import { useGetChatsQuery, usePostChatMutation } from "../backend/redux/api_slice"; // Update the import based on your API slice
 import InputField from "../components/reg/InputField.jsx";
 import Search from "../components/home/Search.jsx";
-import {URLs} from "../__data__/urls";
+import { URLs } from "../__data__/urls";
 
 const Home = () => {
-    const [chats, setChats] = useState([])
+  const [chats, setChats] = useState([]);  // Retained original variable name
-    const [interlocutor, setInterlocutor] = useState("")
+  const [interlocutor, setInterlocutor] = useState("");
 
-    async function retrieveChats() {
+  const username = localStorage.getItem("username");
-        const username = localStorage.getItem("username");
-        if (!username) {
-            displayMessage("You're not logged in!", MessageType.WARN);
-            return;
-        }
 
-        const {ok, data} = await get('/chat/list/' + username);
+  // Use Redux Queries
-        if (!ok) {
+  const { data: chatsData, error: getError, isLoading: isGetting } = useGetChatsQuery(username, {
-            displayMessage(data.message, MessageType.ERROR);
+    skip: !username
-            return;
+  });
-        }
+
-        setChats(data.chats);
+  console.log('From Redux:', chatsData);
+
+  const [createChat, { error: postError }] = usePostChatMutation();
+
+  useEffect(() => {
+    if (getError) {
+      displayMessage(getError.message, MessageType.ERROR);
+    }
+    if (getError) {
+      displayMessage(getError.message, MessageType.ERROR);
+    }
+  }, [getError, postError]);
+
+  useEffect(() => {
+    if (chatsData) {
+      // setChats(chatsData.chats);
+
+      let data = chatsData.chats;
+
+      try {
+        const sortedChats = [...data].sort((a, b) => {
+          const lastMessageA = a.messages[a.messages.length - 1];
+          const lastMessageB = b.messages[b.messages.length - 1];
+
+          const dateA = new Date(lastMessageA.timestamp);
+          const dateB = new Date(lastMessageB.timestamp);
+
+          return dateB - dateA;
+        });
+
+        setChats(sortedChats);
+      } catch (e) {
+        console.error(e);
+      }
+    }
+  }, [chatsData]);
+
+
+  const createChatHandler = async (alias) => {
+    if (!username) {
+      displayMessage("You're not logged in!", MessageType.WARN);
+      return;
     }
 
-    async function createChat(alias) {
+    displayMessage("Sent", MessageType.INFO);
-        const username = localStorage.getItem("username");
-        if (!username) {
-            displayMessage("You're not logged in!", MessageType.WARN);
-            return;
-        }
 
-        displayMessage("Sent", MessageType.INFO);
+    try {
-
+      const data = await createChat({ id1: alias, id2: username }).unwrap(); // Using unwrap to handle promise rejection
-        const {ok, data} = await post('/chat/item/' + username + '/' + alias);
+      localStorage.setItem("message", "Successfully opened chat!");
-        if (!ok) {
+      localStorage.setItem("interlocutorId", alias);
-            displayMessage(data.message, MessageType.ERROR);
+      window.location.href = URLs.chat.url;
-        } else {
+    } catch (error) {
-            localStorage.setItem('message', 'Successfully opened chat!');
+      displayMessage(error.data.message, MessageType.ERROR);
-            localStorage.setItem('interlocutorId', alias);
-            window.location.href = URLs.chat.url;
-        }
     }
+  };
 
-    useEffect(() => {retrieveChats().then()}, [])
+  return (
-
-    return (
       <div className="homeWrapper">
-          <div className="headerPos">
+        <div className="headerPos">
-              <Header/>
+          <Header />
-          </div>
+        </div>
 
-          <HomeTitle/>
+        <HomeTitle />
 
-          <div className="search-input">
+        <div className="search-input">
-              <InputField
+          <InputField
-                  title="Create new chat"
+              title="Create new chat"
-                  value={interlocutor}
+              value={interlocutor}
-                  setValue={setInterlocutor}
+              setValue={setInterlocutor}
-                  placeholder="Enter the username (id)"
+              placeholder="Enter the username (id)"
-              />
+
-          </div>
+              enter={createChatHandler}
+              submit={interlocutor}
+          />
+        </div>
+
+        {isGetting ? (
+            <div>Loading...</div>
+        ) : (
+            <>
+              <Search search={createChatHandler} item={interlocutor} />
+
+              <p>Your chats</p>
+              <ChatsList chats={chats} />
+            </>
+        )}
 
-          <Search search={createChat} item={interlocutor}/>
 
-          <p>Your chats</p>
-          <ChatsList chats={chats} />
       </div>
-  )
+  );
-}
+};
 
-export default Home
+export default Home;

src/pages/SignIn.jsx

@@ -6,6 +6,7 @@ import LoginTitle from "../components/reg/loginTitle.jsx";
 import {MessageType} from "../backend/notifications/message.tsx";
 import {displayMessage} from "../backend/notifications/notifications.js";
 import {post} from "../backend/api.js";
+import {URLs} from "../__data__/urls";
 
 const SignIn = () => {
     const [name, setName] = useState("");
@@ -37,7 +38,7 @@ const SignIn = () => {
         setNameErrorsCounter(0);
 
         localStorage.setItem('message', 'Successfully logged in!');
-        window.location.href = "/";
+        window.location.href = URLs.baseUrl;
     }
 
   return (

src/pages/SignUp.jsx

@@ -5,6 +5,7 @@ import LoginTitle from "../components/reg/loginTitle.jsx";
 import {post} from "../backend/api";
 import {displayMessage} from "../backend/notifications/notifications";
 import {MessageType} from "../backend/notifications/message";
+import { URLs } from "../__data__/urls";
 
 
 const SignUp = () => {
@@ -47,7 +48,7 @@ const SignUp = () => {
         localStorage.setItem('username', name);
 
         localStorage.setItem('message', 'Successfully signed up!');
-        window.location.href = "/";
+        window.location.href = URLs.baseUrl;
     }
 
     return (

src/pages/css/Chat.css

@@ -1,3 +1,7 @@
+body {
+  background: linear-gradient(to right, #e0f7fa, #fffde7);
+}
+
 .chat-container {
   display: flex;
   flex-direction: column;
@@ -11,10 +15,13 @@
 }
 
 .chat-header {
-  padding: 10px;
+  padding: 15px;
   background-color: #007bff;
   color: white;
   text-align: center;
+  font-weight: bold;
+  letter-spacing: 1px;
+  border-bottom: 2px solid #0056b3;
 }
 
 .chat-messages {
@@ -24,6 +31,7 @@
   padding: 10px;
   overflow-y: auto;
   background-color: #fff;
+  max-height: 400px;
 }
 
 .message-bubble {
@@ -33,6 +41,12 @@
   max-width: 70%;
   word-wrap: break-word;
   display: inline-block;
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+  transition: transform 0.2s;
+}
+
+.message-bubble:hover {
+  transform: translateY(-2px);
 }
 
 .sent {
@@ -58,8 +72,9 @@
 
 .message-timestamp {
   font-size: 10px;
-  color: #999;
+  color: black;
-  margin-top: 5px;
+  text-align: right;
+  margin-top: 4px;
   display: block;
 }
 

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/chats.json

@@ -7,25 +7,25 @@
         "data": "Hello Bob!",
         "senderId": "alice",
         "recipientId": "bobsm",
-        "timestamp": "07:00:00 AM"
+        "timestamp": "09.10.2024 07:00:00"
       },
       {
         "data": "Hey Alice, how are you?",
         "senderId": "bobsm",
         "recipientId": "alice",
-        "timestamp": "07:05:00 AM"
+        "timestamp": "09.10.2024 07:05:00"
       },
       {
         "data": "I'm good, thanks for asking.",
         "senderId": "alice",
         "recipientId": "bobsm",
-        "timestamp": "07:10:00 AM"
+        "timestamp": "09.10.2024 07:10:00"
       },
       {
         "data": "Glad to hear!",
         "senderId": "bobsm",
         "recipientId": "alice",
-        "timestamp": "07:15:00 AM"
+        "timestamp": "09.10.2024 07:15:00"
       }
     ]
   },
@@ -37,25 +37,25 @@
         "data": "How's the project going?",
         "senderId": "alice",
         "recipientId": "charl",
-        "timestamp": "07:20:00 AM"
+        "timestamp": "09.10.2024 07:20:00"
       },
       {
         "data": "It's coming along, almost done!",
         "senderId": "charl",
         "recipientId": "alice",
-        "timestamp": "07:25:00 AM"
+        "timestamp": "09.10.2024 07:25:00"
       },
       {
         "data": "That's great to hear!",
         "senderId": "alice",
         "recipientId": "charl",
-        "timestamp": "07:30:00 AM"
+        "timestamp": "09.10.2024 07:30:00"
       },
       {
         "data": "Thanks for checking in.",
         "senderId": "charl",
         "recipientId": "alice",
-        "timestamp": "07:35:00 AM"
+        "timestamp": "09.10.2024 07:35:00"
       }
     ]
   },
@@ -67,55 +67,25 @@
         "data": "Did you get the files?",
         "senderId": "david",
         "recipientId": "alice",
-        "timestamp": "07:40:00 AM"
+        "timestamp": "09.10.2024 07:40:00"
       },
       {
         "data": "Yes, I did. Thank you!",
         "senderId": "alice",
         "recipientId": "david",
-        "timestamp": "07:45:00 AM"
+        "timestamp": "09.10.2024 07:45:00"
       },
       {
         "data": "You're welcome.",
         "senderId": "david",
         "recipientId": "alice",
-        "timestamp": "07:50:00 AM"
+        "timestamp": "09.10.2024 07:50:00"
       },
       {
         "data": "Let me know if you need anything else.",
         "senderId": "alice",
         "recipientId": "david",
-        "timestamp": "07:55:00 AM"
+        "timestamp": "09.10.2024 07:55:00"
-      }
-    ]
-  },
-  {
-    "id1": "alice",
-    "id2": "evead",
-    "messages": [
-      {
-        "data": "Eve, do you have the meeting details?",
-        "senderId": "alice",
-        "recipientId": "evead",
-        "timestamp": "08:00:00 AM"
-      },
-      {
-        "data": "Yes, I just sent them to you.",
-        "senderId": "evead",
-        "recipientId": "alice",
-        "timestamp": "08:05:00 AM"
-      },
-      {
-        "data": "Got it, thanks!",
-        "senderId": "alice",
-        "recipientId": "evead",
-        "timestamp": "08:10:00 AM"
-      },
-      {
-        "data": "You're welcome.",
-        "senderId": "evead",
-        "recipientId": "alice",
-        "timestamp": "08:15:00 AM"
       }
     ]
   },
@@ -127,25 +97,25 @@
         "data": "Can you review this document for me?",
         "senderId": "alice",
         "recipientId": "frank",
-        "timestamp": "08:20:00 AM"
+        "timestamp": "09.10.2024 08:20:00"
       },
       {
         "data": "Sure, I'll take a look.",
         "senderId": "frank",
         "recipientId": "alice",
-        "timestamp": "08:25:00 AM"
+        "timestamp": "09.10.2024 08:25:00"
       },
       {
         "data": "Thanks, much appreciated!",
         "senderId": "alice",
         "recipientId": "frank",
-        "timestamp": "08:30:00 AM"
+        "timestamp": "09.10.2024 08:30:00"
       },
       {
         "data": "No problem.",
         "senderId": "frank",
         "recipientId": "alice",
-        "timestamp": "08:35:00 AM"
+        "timestamp": "09.10.2024 08:35:00"
       }
     ]
   },
@@ -157,25 +127,25 @@
         "data": "Hey Grace, let's meet up for coffee!",
         "senderId": "alice",
         "recipientId": "grace",
-        "timestamp": "08:40:00 AM"
+        "timestamp": "09.10.2024 08:40:00"
       },
       {
         "data": "Sounds good, when are you free?",
         "senderId": "grace",
         "recipientId": "alice",
-        "timestamp": "08:45:00 AM"
+        "timestamp": "09.10.2024 08:45:00"
       },
       {
         "data": "How about tomorrow afternoon?",
         "senderId": "alice",
         "recipientId": "grace",
-        "timestamp": "08:50:00 AM"
+        "timestamp": "09.10.2024 08:50:00"
       },
       {
         "data": "Works for me!",
         "senderId": "grace",
         "recipientId": "alice",
-        "timestamp": "08:55:00 AM"
+        "timestamp": "09.10.2024 08:55:00"
       }
     ]
   },
@@ -187,25 +157,25 @@
         "data": "Hannah, do you have a moment?",
         "senderId": "alice",
         "recipientId": "hanna",
-        "timestamp": "09:00:00 AM"
+        "timestamp": "09.10.2024 09:00:00"
       },
       {
         "data": "Sure, what's up?",
         "senderId": "hanna",
         "recipientId": "alice",
-        "timestamp": "09:05:00 AM"
+        "timestamp": "09.10.2024 09:05:00"
       },
       {
         "data": "Just wanted to check on the report.",
         "senderId": "alice",
         "recipientId": "hanna",
-        "timestamp": "09:10:00 AM"
+        "timestamp": "09.10.2024 09:10:00"
       },
       {
         "data": "I'll send it soon.",
         "senderId": "hanna",
         "recipientId": "alice",
-        "timestamp": "09:15:00 AM"
+        "timestamp": "09.10.2024 09:15:00"
       }
     ]
   },
@@ -217,25 +187,25 @@
         "data": "Ian, have you completed the review?",
         "senderId": "alice",
         "recipientId": "ianda",
-        "timestamp": "09:20:00 AM"
+        "timestamp": "09.10.2024 09:20:00"
       },
       {
         "data": "Yes, I sent my feedback.",
         "senderId": "ianda",
         "recipientId": "alice",
-        "timestamp": "09:25:00 AM"
+        "timestamp": "09.10.2024 09:25:00"
       },
       {
         "data": "Thanks for that.",
         "senderId": "alice",
         "recipientId": "ianda",
-        "timestamp": "09:30:00 AM"
+        "timestamp": "09.10.2024 09:30:00"
       },
       {
         "data": "Anytime!",
         "senderId": "ianda",
         "recipientId": "alice",
-        "timestamp": "09:35:00 AM"
+        "timestamp": "09.10.2024 09:35:00"
       }
     ]
   },
@@ -247,25 +217,25 @@
         "data": "Jill, let's schedule a catch-up meeting.",
         "senderId": "alice",
         "recipientId": "jillt",
-        "timestamp": "09:40:00 AM"
+        "timestamp": "09.10.2024 09:40:00"
       },
       {
         "data": "Sounds good, when works for you?",
         "senderId": "jillt",
         "recipientId": "alice",
-        "timestamp": "09:45:00 AM"
+        "timestamp": "09.10.2024 09:45:00"
       },
       {
         "data": "Tomorrow afternoon?",
         "senderId": "alice",
         "recipientId": "jillt",
-        "timestamp": "09:50:00 AM"
+        "timestamp": "09.10.2024 09:50:00"
       },
       {
         "data": "That works for me!",
         "senderId": "jillt",
         "recipientId": "alice",
-        "timestamp": "09:55:00 AM"
+        "timestamp": "09.10.2024 09:55:00"
       }
     ]
   },
@@ -277,25 +247,25 @@
         "data": "Eve, did you send the schedule?",
         "senderId": "alice",
         "recipientId": "evead",
-        "timestamp": "10:00:00 AM"
+        "timestamp": "09.10.2024 10:00:00"
       },
       {
         "data": "Yes, just sent it.",
         "senderId": "evead",
         "recipientId": "alice",
-        "timestamp": "10:05:00 AM"
+        "timestamp": "09.10.2024 10:05:00"
       },
       {
         "data": "Thanks, much appreciated!",
         "senderId": "alice",
         "recipientId": "evead",
-        "timestamp": "10:10:00 AM"
+        "timestamp": "09.10.2024 10:10:00"
       },
       {
         "data": "No problem!",
         "senderId": "evead",
         "recipientId": "alice",
-        "timestamp": "10:15:00 AM"
+        "timestamp": "09.10.2024 10:15:00"
       }
     ]
   },
@@ -307,25 +277,25 @@
         "data": "How's everything going?",
         "senderId": "bobsm",
         "recipientId": "charl",
-        "timestamp": "10:20:00 AM"
+        "timestamp": "09.10.2024 10:20:00"
       },
       {
         "data": "Pretty good, how about you?",
         "senderId": "charl",
         "recipientId": "bobsm",
-        "timestamp": "10:25:00 AM"
+        "timestamp": "09.10.2024 10:25:00"
       },
       {
         "data": "Can't complain!",
         "senderId": "bobsm",
         "recipientId": "charl",
-        "timestamp": "10:30:00 AM"
+        "timestamp": "09.10.2024 10:30:00"
       },
       {
         "data": "Glad to hear that.",
         "senderId": "charl",
         "recipientId": "bobsm",
-        "timestamp": "10:35:00 AM"
+        "timestamp": "09.10.2024 10:35:00"
       }
     ]
   },
@@ -337,25 +307,25 @@
         "data": "Can you send the report?",
         "senderId": "bobsm",
         "recipientId": "david",
-        "timestamp": "10:40:00 AM"
+        "timestamp": "09.10.2024 10:40:00"
       },
       {
         "data": "I'll send it in an hour.",
         "senderId": "david",
         "recipientId": "bobsm",
-        "timestamp": "10:45:00 AM"
+        "timestamp": "09.10.2024 10:45:00"
       },
       {
         "data": "Perfect, thanks.",
         "senderId": "bobsm",
         "recipientId": "david",
-        "timestamp": "10:50:00 AM"
+        "timestamp": "09.10.2024 10:50:00"
       },
       {
         "data": "No problem.",
         "senderId": "david",
         "recipientId": "bobsm",
-        "timestamp": "10:55:00 AM"
+        "timestamp": "09.10.2024 10:55:00"
       }
     ]
   },
@@ -367,25 +337,25 @@
         "data": "Hey Eve, how's it going?",
         "senderId": "charl",
         "recipientId": "evead",
-        "timestamp": "11:00:00 AM"
+        "timestamp": "09.10.2024 11:00:00"
       },
       {
         "data": "Good, how about you?",
         "senderId": "evead",
         "recipientId": "charl",
-        "timestamp": "11:05:00 AM"
+        "timestamp": "09.10.2024 11:05:00"
       },
       {
         "data": "Can't complain!",
         "senderId": "charl",
         "recipientId": "evead",
-        "timestamp": "11:10:00 AM"
+        "timestamp": "09.10.2024 11:10:00"
       },
       {
         "data": "Glad to hear.",
         "senderId": "evead",
         "recipientId": "charl",
-        "timestamp": "11:15:00 AM"
+        "timestamp": "09.10.2024 11:15:00"
       }
     ]
   },
@@ -397,25 +367,25 @@
         "data": "Do you have time to talk today?",
         "senderId": "charl",
         "recipientId": "frank",
-        "timestamp": "11:20:00 AM"
+        "timestamp": "09.10.2024 11:20:00"
       },
       {
         "data": "I have a meeting, but I can chat afterward.",
         "senderId": "frank",
         "recipientId": "charl",
-        "timestamp": "11:25:00 AM"
+        "timestamp": "09.10.2024 11:25:00"
       },
       {
         "data": "Sounds good.",
         "senderId": "charl",
         "recipientId": "frank",
-        "timestamp": "11:30:00 AM"
+        "timestamp": "09.10.2024 11:30:00"
       },
       {
         "data": "I'll message you after.",
         "senderId": "frank",
         "recipientId": "charl",
-        "timestamp": "11:35:00 AM"
+        "timestamp": "09.10.2024 11:35:00"
       }
     ]
   },
@@ -427,25 +397,25 @@
         "data": "Did you review the document?",
         "senderId": "david",
         "recipientId": "frank",
-        "timestamp": "11:40:00 AM"
+        "timestamp": "09.10.2024 11:40:00"
       },
       {
         "data": "Yes, it's all good.",
         "senderId": "frank",
         "recipientId": "david",
-        "timestamp": "11:45:00 AM"
+        "timestamp": "09.10.2024 11:45:00"
       },
       {
         "data": "Great, thanks for the quick turnaround!",
         "senderId": "david",
         "recipientId": "frank",
-        "timestamp": "11:50:00 AM"
+        "timestamp": "09.10.2024 11:50:00"
       },
       {
         "data": "No worries!",
         "senderId": "frank",
         "recipientId": "david",
-        "timestamp": "11:55:00 AM"
+        "timestamp": "09.10.2024 11:55:00"
       }
     ]
   },
@@ -457,25 +427,25 @@
         "data": "Grace, can you send the updated schedule?",
         "senderId": "david",
         "recipientId": "grace",
-        "timestamp": "12:00:00 PM"
+        "timestamp": "09.10.2024 12:00:00"
       },
       {
         "data": "Yes, I'll send it in a few minutes.",
         "senderId": "grace",
         "recipientId": "david",
-        "timestamp": "12:05:00 PM"
+        "timestamp": "09.10.2024 12:05:00"
       },
       {
         "data": "Thanks, much appreciated!",
         "senderId": "david",
         "recipientId": "grace",
-        "timestamp": "12:10:00 PM"
+        "timestamp": "09.10.2024 12:10:00"
       },
       {
         "data": "You're welcome!",
         "senderId": "grace",
         "recipientId": "david",
-        "timestamp": "12:15:00 PM"
+        "timestamp": "09.10.2024 12:15:00"
       }
     ]
   },
@@ -487,25 +457,25 @@
         "data": "How are you today?",
         "senderId": "frank",
         "recipientId": "grace",
-        "timestamp": "12:20:00 PM"
+        "timestamp": "09.10.2024 12:20:00"
       },
       {
         "data": "I'm doing well, thanks for asking.",
         "senderId": "grace",
         "recipientId": "frank",
-        "timestamp": "12:25:00 PM"
+        "timestamp": "09.10.2024 12:25:00"
       },
       {
         "data": "Glad to hear that.",
         "senderId": "frank",
         "recipientId": "grace",
-        "timestamp": "12:30:00 PM"
+        "timestamp": "09.10.2024 12:30:00"
       },
       {
         "data": "How about you?",
         "senderId": "grace",
         "recipientId": "frank",
-        "timestamp": "12:35:00 PM"
+        "timestamp": "09.10.2024 12:35:00"
       }
     ]
   },
@@ -517,25 +487,25 @@
         "data": "Did you attend the meeting?",
         "senderId": "frank",
         "recipientId": "hanna",
-        "timestamp": "12:40:00 PM"
+        "timestamp": "09.10.2024 12:40:00"
       },
       {
         "data": "Yes, it was productive.",
         "senderId": "hanna",
         "recipientId": "frank",
-        "timestamp": "12:45:00 PM"
+        "timestamp": "09.10.2024 12:45:00"
       },
       {
         "data": "Good to hear!",
         "senderId": "frank",
         "recipientId": "hanna",
-        "timestamp": "12:50:00 PM"
+        "timestamp": "09.10.2024 12:50:00"
       },
       {
         "data": "Indeed, lots to follow up on.",
         "senderId": "hanna",
         "recipientId": "frank",
-        "timestamp": "12:55:00 PM"
+        "timestamp": "09.10.2024 12:55:00"
       }
     ]
   },
@@ -547,25 +517,25 @@
         "data": "Can we meet later today?",
         "senderId": "grace",
         "recipientId": "hanna",
-        "timestamp": "01:00:00 PM"
+        "timestamp": "09.10.2024 01:00:00"
       },
       {
         "data": "Sure, what's a good time?",
         "senderId": "hanna",
         "recipientId": "grace",
-        "timestamp": "01:05:00 PM"
+        "timestamp": "09.10.2024 01:05:00"
       },
       {
-        "data": "How about 3 PM?",
+        "data": "How about 3?",
         "senderId": "grace",
         "recipientId": "hanna",
-        "timestamp": "01:10:00 PM"
+        "timestamp": "09.10.2024 01:10:00"
       },
       {
         "data": "Works for me.",
         "senderId": "hanna",
         "recipientId": "grace",
-        "timestamp": "01:15:00 PM"
+        "timestamp": "09.10.2024 01:15:00"
       }
     ]
   },
@@ -577,25 +547,25 @@
         "data": "Ian, did you get the message I sent?",
         "senderId": "grace",
         "recipientId": "ianda",
-        "timestamp": "01:20:00 PM"
+        "timestamp": "09.10.2024 01:20:00"
       },
       {
         "data": "Yes, I'll respond soon.",
         "senderId": "ianda",
         "recipientId": "grace",
-        "timestamp": "01:25:00 PM"
+        "timestamp": "09.10.2024 01:25:00"
       },
       {
         "data": "Thanks, appreciate it!",
         "senderId": "grace",
         "recipientId": "ianda",
-        "timestamp": "01:30:00 PM"
+        "timestamp": "09.10.2024 01:30:00"
       },
       {
         "data": "You're welcome!",
         "senderId": "ianda",
         "recipientId": "grace",
-        "timestamp": "01:35:00 PM"
+        "timestamp": "09.10.2024 01:35:00"
       }
     ]
   },
@@ -607,25 +577,25 @@
         "data": "Ian, do you have a minute?",
         "senderId": "hanna",
         "recipientId": "ianda",
-        "timestamp": "01:40:00 PM"
+        "timestamp": "09.10.2024 01:40:00"
       },
       {
         "data": "Yes, what do you need?",
         "senderId": "ianda",
         "recipientId": "hanna",
-        "timestamp": "01:45:00 PM"
+        "timestamp": "09.10.2024 01:45:00"
       },
       {
         "data": "Just a quick update on the project.",
         "senderId": "hanna",
         "recipientId": "ianda",
-        "timestamp": "01:50:00 PM"
+        "timestamp": "09.10.2024 01:50:00"
       },
       {
         "data": "I'll email you the details.",
         "senderId": "ianda",
         "recipientId": "hanna",
-        "timestamp": "01:55:00 PM"
+        "timestamp": "09.10.2024 01:55:00"
       }
     ]
   },
@@ -637,25 +607,25 @@
         "data": "Jill, can we talk tomorrow?",
         "senderId": "hanna",
         "recipientId": "jillt",
-        "timestamp": "02:00:00 PM"
+        "timestamp": "09.10.2024 02:00:00"
       },
       {
-        "data": "Yes, I'm free after 2 PM.",
+        "data": "Yes, I'm free after 2.",
         "senderId": "jillt",
         "recipientId": "hanna",
-        "timestamp": "02:05:00 PM"
+        "timestamp": "09.10.2024 02:05:00"
       },
       {
         "data": "Perfect, see you then.",
         "senderId": "hanna",
         "recipientId": "jillt",
-        "timestamp": "02:10:00 PM"
+        "timestamp": "09.10.2024 02:10:00"
       },
       {
         "data": "Looking forward to it.",
         "senderId": "jillt",
         "recipientId": "hanna",
-        "timestamp": "02:15:00 PM"
+        "timestamp": "09.10.2024 02:15:00"
       }
     ]
   },
@@ -667,25 +637,25 @@
         "data": "Jill, I have the files you requested.",
         "senderId": "ianda",
         "recipientId": "jillt",
-        "timestamp": "02:20:00 PM"
+        "timestamp": "09.10.2024 02:20:00"
       },
       {
         "data": "Thanks, please send them over.",
         "senderId": "jillt",
         "recipientId": "ianda",
-        "timestamp": "02:25:00 PM"
+        "timestamp": "09.10.2024 02:25:00"
       },
       {
         "data": "I'll send them right now.",
         "senderId": "ianda",
         "recipientId": "jillt",
-        "timestamp": "02:30:00 PM"
+        "timestamp": "09.10.2024 02:30:00"
       },
       {
         "data": "Great, thanks again!",
         "senderId": "jillt",
         "recipientId": "ianda",
-        "timestamp": "02:35:00 PM"
+        "timestamp": "09.10.2024 02:35:00"
       }
     ]
   }

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