diff --git a/README.md b/README.md index 24d0991..2585e65 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ Ararat International School - платформа по обучению игры - Express.js - Mongo DB +#### V 0.04 +- Пункт Мессенджер теперь ведет по пути /messenger +- [Messenger] Добавлен sidebar +- [Messenger] Добавлен список чатов + #### V 0.03 - Добавленны UI компоненты: Input, Button, Modal - Валидация форм регистрации/авторизации diff --git a/client/package-lock.json b/client/package-lock.json index 4bc7645..dc5e306 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -25,6 +25,7 @@ "uniqid": "^5.4.0" }, "devDependencies": { + "@faker-js/faker": "^8.0.2", "@types/body-scroll-lock": "^3.1.0", "@types/react": "^18.2.14", "@types/react-dom": "^18.2.6", @@ -871,6 +872,22 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@faker-js/faker": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.0.2.tgz", + "integrity": "sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/fakerjs" + } + ], + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0", + "npm": ">=6.14.13" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", diff --git a/client/package.json b/client/package.json index b5c903f..0389738 100644 --- a/client/package.json +++ b/client/package.json @@ -27,6 +27,7 @@ "uniqid": "^5.4.0" }, "devDependencies": { + "@faker-js/faker": "^8.0.2", "@types/body-scroll-lock": "^3.1.0", "@types/react": "^18.2.14", "@types/react-dom": "^18.2.6", diff --git a/client/src/App.tsx b/client/src/App.tsx index 52352b3..30b439e 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -4,6 +4,7 @@ import OnlyUnauthorized from "./components/Auth/OnlyUnauthorized" import IndexPage from "./pages/IndexPage" import LoginPage from "./pages/LoginPage" import RegisterPage from "./pages/RegisterPage" +import MessengerPage from "./pages/Messenger/MessengerPage" import { BrowserRouter, Routes, Route } from 'react-router-dom' import { checkAuth, userSlice } from "./store/reducers/UserSlice"; import { useAppDispatch, useAppSelector } from "./hooks/redux" @@ -34,6 +35,7 @@ function App() { }/> }/> }/> + }/> ) diff --git a/client/src/assets/logo_sm_white.png b/client/src/assets/logo_sm_white.png new file mode 100644 index 0000000..616ca9d Binary files /dev/null and b/client/src/assets/logo_sm_white.png differ diff --git a/client/src/assets/logo_white.png b/client/src/assets/logo_white.png new file mode 100644 index 0000000..9cfdf35 Binary files /dev/null and b/client/src/assets/logo_white.png differ diff --git a/client/src/components/Index/Sidebar/Menu.tsx b/client/src/components/Index/Sidebar/Menu.tsx index 525a9ae..9e42bef 100644 --- a/client/src/components/Index/Sidebar/Menu.tsx +++ b/client/src/components/Index/Sidebar/Menu.tsx @@ -16,7 +16,7 @@ const Menu: FC = () => {