diff --git a/data.json b/data.json index d30bade..cdaf6d8 100644 --- a/data.json +++ b/data.json @@ -11,6 +11,18 @@ "password": "123456", "isAdmin": true, "status": null + }, + { + "id": 2, + "name": "Алексей", + "surname": "Мальков", + "birthday": "12.05.2000", + "city": "г. Москва", + "avatarImg": null, + "username": "amalkov", + "password": "123456", + "isAdmin": false, + "status": null } ] } diff --git a/package.json b/package.json index 7343770..4d996d8 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "version": "0.0.0", "type": "module", "scripts": { - "start": "vite", - "fake-server": "json-server -p 8081 -w data.json", - "dev": "npm-run-all --parallel start fake-server", + "front": "vite", + "back": "json-server -p 8081 -w data.json", + "dev": "npm-run-all --parallel front back", "serve": "http-server -p 80 ./dist/", "build": "vite build", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx index d1dcc85..78929ec 100644 --- a/src/components/header/header.jsx +++ b/src/components/header/header.jsx @@ -8,6 +8,9 @@ const Header = ({ routes }) => { const location = useLocation(); const indexPageLink = routes.filter((route) => route.index === false).shift(); const currentPage = routes.filter((route) => route.path === location.pathname)[0]; + + document.title = currentPage.title; + return (
diff --git a/src/components/headerusermenu/headerusermenu.css b/src/components/headerusermenu/headerusermenu.css index eb9ae78..fc5b597 100644 --- a/src/components/headerusermenu/headerusermenu.css +++ b/src/components/headerusermenu/headerusermenu.css @@ -19,6 +19,10 @@ fill: black; } +.headerusermenu__dropdownitem:hover span { + color: black; +} + @media (prefers-color-scheme: dark) { .headerusermenu__dropdown .dropdown-toggle { --bs-btn-bg: var(--light-background-color); diff --git a/src/components/headerusermenu/headerusermenu.jsx b/src/components/headerusermenu/headerusermenu.jsx index 7d3b32b..f61bae4 100644 --- a/src/components/headerusermenu/headerusermenu.jsx +++ b/src/components/headerusermenu/headerusermenu.jsx @@ -36,13 +36,13 @@ const HeaderUserMenu = () => { - Моя страница + Моя страница - Настройки + Настройки - Выход + Выход