Работает авторизация и регистрация
This commit is contained in:
parent
cda991cd94
commit
8639004014
126
data.json
126
data.json
@ -26,6 +26,15 @@
|
||||
"password": "123456",
|
||||
"isTeacher": false,
|
||||
"groupId": 1
|
||||
},
|
||||
{
|
||||
"name": "Алексей",
|
||||
"surname": "Крюков",
|
||||
"username": "akrukov",
|
||||
"password": "123",
|
||||
"isTeacher": false,
|
||||
"groupId": 1,
|
||||
"id": 4
|
||||
}
|
||||
],
|
||||
"groups": [
|
||||
@ -119,73 +128,10 @@
|
||||
"statements": [
|
||||
{
|
||||
"id": 1,
|
||||
"subjectId": 6,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 2,
|
||||
"date": "Dec 25 2023"
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"subjectId": 8,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 2,
|
||||
"date": "Dec 26 2023"
|
||||
}
|
||||
{
|
||||
"id": 3,
|
||||
"subjectId": 7,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 2,
|
||||
"date": "Dec 27 2023"
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"subjectId": 9,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 2,
|
||||
"date": "Dec 28 2023"
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"subjectId": 3,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 2,
|
||||
"date": "Dec 28 2023"
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"subjectId": 10,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 2,
|
||||
"date": "Dec 29 2023"
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"subjectId": 1,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 1,
|
||||
"date": "Jan 11 2024"
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"subjectId": 11,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 1,
|
||||
"date": "Jan 15 2024"
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"subjectId": 2,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 1,
|
||||
"date": "Jan 18 2024"
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"subjectId": 12,
|
||||
"groupId": 1,
|
||||
"controlTypeId": 1,
|
||||
"date": "Jan 23 2024"
|
||||
"controlTypeId": 2,
|
||||
"date": "Dec 23 2023"
|
||||
}
|
||||
],
|
||||
"controltypes": [
|
||||
@ -202,56 +148,8 @@
|
||||
{
|
||||
"id": 1,
|
||||
"userId": 1,
|
||||
"markId": 6,
|
||||
"markId": 1,
|
||||
"statementId": 1
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"userId": 1,
|
||||
"markId": 6,
|
||||
"statementId": 2
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"userId": 1,
|
||||
"markId": 6,
|
||||
"statementId": 3
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"userId": 1,
|
||||
"markId": 6,
|
||||
"statementId": 4
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"userId": 1,
|
||||
"markId": 6,
|
||||
"statementId": 5
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"userId": 1,
|
||||
"markId": 5,
|
||||
"statementId": 6
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"userId": 1,
|
||||
"markId": 5,
|
||||
"statementId": 7
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"userId": 1,
|
||||
"markId": 4,
|
||||
"statementId": 8
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"userId": 1,
|
||||
"markId": 3,
|
||||
"statementId": 9
|
||||
}
|
||||
]
|
||||
}
|
||||
10
index.html
10
index.html
@ -1,13 +1,13 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru" data-bs-theme="dark">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<link rel="icon" type="image/svg+xml" href="./src/assets/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Vite + React</title>
|
||||
<title>Учебный процесс</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<div id="root" class="min-vh-100 d-flex flex-column"></div>
|
||||
<script type="module" src="/src/main.jsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
42
src/App.css
42
src/App.css
@ -1,42 +0,0 @@
|
||||
#root {
|
||||
max-width: 1280px;
|
||||
margin: 0 auto;
|
||||
padding: 2rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.logo {
|
||||
height: 6em;
|
||||
padding: 1.5em;
|
||||
will-change: filter;
|
||||
transition: filter 300ms;
|
||||
}
|
||||
.logo:hover {
|
||||
filter: drop-shadow(0 0 2em #646cffaa);
|
||||
}
|
||||
.logo.react:hover {
|
||||
filter: drop-shadow(0 0 2em #61dafbaa);
|
||||
}
|
||||
|
||||
@keyframes logo-spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
a:nth-of-type(2) .logo {
|
||||
animation: logo-spin infinite 20s linear;
|
||||
}
|
||||
}
|
||||
|
||||
.card {
|
||||
padding: 2em;
|
||||
}
|
||||
|
||||
.read-the-docs {
|
||||
color: #888;
|
||||
}
|
||||
51
src/App.jsx
51
src/App.jsx
@ -1,35 +1,32 @@
|
||||
import { useState } from 'react'
|
||||
import reactLogo from './assets/react.svg'
|
||||
import viteLogo from '/vite.svg'
|
||||
import './App.css'
|
||||
import { Outlet } from 'react-router-dom';
|
||||
import { Container } from 'react-bootstrap';
|
||||
import { CurrentUserContext } from './contexts/CurrentUserContext';
|
||||
import Header from './components/header/header';
|
||||
import Footer from './components/footer/footer';
|
||||
import { PropTypes } from 'prop-types';
|
||||
|
||||
function App() {
|
||||
const [count, setCount] = useState(0)
|
||||
|
||||
const App = ({ routes }) => {
|
||||
const [currentUser, setCurrentUser] = useState(null);
|
||||
return (
|
||||
<>
|
||||
<div>
|
||||
<a href="https://vitejs.dev">
|
||||
<img src={viteLogo} className="logo" alt="Vite logo" />
|
||||
</a>
|
||||
<a href="https://react.dev">
|
||||
<img src={reactLogo} className="logo react" alt="React logo" />
|
||||
</a>
|
||||
</div>
|
||||
<h1>Vite + React</h1>
|
||||
<div className="card">
|
||||
<button onClick={() => setCount((count) => count + 1)}>
|
||||
count is {count}
|
||||
</button>
|
||||
<p>
|
||||
Edit <code>src/App.jsx</code> and save to test HMR
|
||||
</p>
|
||||
</div>
|
||||
<p className="read-the-docs">
|
||||
Click on the Vite and React logos to learn more
|
||||
</p>
|
||||
<CurrentUserContext.Provider value={{
|
||||
currentUser,
|
||||
setCurrentUser,
|
||||
}}>
|
||||
<Header routes={routes}></Header>
|
||||
<main className='d-flex flex-column position-relative flex-fill'>
|
||||
<Outlet />
|
||||
</main>
|
||||
<Footer></Footer>
|
||||
</CurrentUserContext.Provider>
|
||||
</>
|
||||
)
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
App.propTypes = {
|
||||
routes: PropTypes.array,
|
||||
};
|
||||
|
||||
export default App
|
||||
|
||||
40
src/api/ApiClient.js
Normal file
40
src/api/ApiClient.js
Normal file
@ -0,0 +1,40 @@
|
||||
import axios from "axios";
|
||||
import { Toast } from "react-bootstrap";
|
||||
|
||||
export class HttpError extends Error {
|
||||
constructor(message = "") {
|
||||
super(message);
|
||||
this.name = "HttpError";
|
||||
Object.setPrototypeOf(this, new.target.prototype);
|
||||
Toast.error(message, { id: "HttpError" });
|
||||
}
|
||||
}
|
||||
|
||||
function responseHandler(response) {
|
||||
if (response.status === 200 || response.status === 201) {
|
||||
const data = response?.data;
|
||||
if (!data) {
|
||||
throw new HttpError("API Error. No data!");
|
||||
}
|
||||
return data;
|
||||
}
|
||||
throw new HttpError(`API Error! Invalid status code ${response.status}!`);
|
||||
}
|
||||
|
||||
function responseErrorHandler(error) {
|
||||
if (error === null) {
|
||||
throw new Error("Unrecoverable error!! Error is null!");
|
||||
}
|
||||
Toast.error(error.message, { id: "AxiosError" });
|
||||
return Promise.reject(error.message);
|
||||
}
|
||||
|
||||
export const ApiClient = axios.create({
|
||||
baseURL: "http://localhost:8081/",
|
||||
timeout: "3000",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
},
|
||||
});
|
||||
|
||||
ApiClient.interceptors.response.use(responseHandler, responseErrorHandler);
|
||||
34
src/api/ApiService.js
Normal file
34
src/api/ApiService.js
Normal file
@ -0,0 +1,34 @@
|
||||
import { ApiClient } from "./ApiClient";
|
||||
|
||||
class ApiService {
|
||||
constructor(url) {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
async getAll() {
|
||||
return ApiClient.get(`${this.url}`);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line no-dupe-class-members
|
||||
async getAll(expand) {
|
||||
return ApiClient.get(`${this.url}${expand || ""}`);
|
||||
}
|
||||
|
||||
async get(id, expand) {
|
||||
return ApiClient.get(`${this.url}/${id}${expand || ""}`);
|
||||
}
|
||||
|
||||
async create(body) {
|
||||
return ApiClient.post(this.url, body);
|
||||
}
|
||||
|
||||
async update(id, body) {
|
||||
return ApiClient.put(`${this.url}/${id}`, body);
|
||||
}
|
||||
|
||||
async delete(id) {
|
||||
return ApiClient.delete(`${this.url}/${id}`);
|
||||
}
|
||||
}
|
||||
|
||||
export default ApiService;
|
||||
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 4.0 KiB |
1
src/assets/vite.svg
Normal file
1
src/assets/vite.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
11
src/components/footer/footer.jsx
Normal file
11
src/components/footer/footer.jsx
Normal file
@ -0,0 +1,11 @@
|
||||
const Footer = () => {
|
||||
const year = new Date().getFullYear();
|
||||
|
||||
return (
|
||||
<footer className="d-flex align-items-center m-2">
|
||||
© {year} ns.potapov
|
||||
</footer>
|
||||
);
|
||||
};
|
||||
|
||||
export default Footer;
|
||||
55
src/components/header/header.jsx
Normal file
55
src/components/header/header.jsx
Normal file
@ -0,0 +1,55 @@
|
||||
import PropTypes from 'prop-types';
|
||||
import { Container, Navbar, Nav } from 'react-bootstrap';
|
||||
import { Link, useLocation, useNavigate } from 'react-router-dom';
|
||||
import { useContext } from 'react';
|
||||
import { CurrentUserContext } from '../../contexts/CurrentUserContext';
|
||||
|
||||
const Header = ({ routes }) => {
|
||||
const location = useLocation();
|
||||
const navigate = useNavigate();
|
||||
const { currentUser, setCurrentUser } = useContext(CurrentUserContext);
|
||||
const indexPageLink = routes.filter((route) => route.index === false).shift();
|
||||
const currentPage = routes.filter((route) => route.path === location.pathname)[0];
|
||||
if (currentUser) {
|
||||
routes = routes.filter((route) => route.onlyNoAuthorized != true);
|
||||
}
|
||||
|
||||
return (
|
||||
<header className='sticky-top'>
|
||||
<Navbar expand='md'>
|
||||
<Container fluid>
|
||||
<Navbar.Brand as={Link} to={indexPageLink?.path ?? '/'}>
|
||||
Учебный процесс
|
||||
</Navbar.Brand>
|
||||
<Navbar.Toggle aria-controls='main-navbar' />
|
||||
<Navbar.Collapse id='main-navbar'>
|
||||
<Nav className='me-auto link' activeKey={location.pathname}>
|
||||
{
|
||||
routes.map((route, index) =>
|
||||
<Nav.Link as={Link} key={index} to={route.path ?? '/'} active={route == currentPage}>
|
||||
{route.title}
|
||||
</Nav.Link>
|
||||
)
|
||||
}
|
||||
{
|
||||
currentUser != null ? <div className='d-flex align-items-center d-md-none'>Привет, {currentUser.name} {currentUser.surname}!<button className='ms-3 btn btn-outline-danger btn-sm' onClick={() => { setCurrentUser(null); navigate('/'); }}>Выход</button></div> : ""
|
||||
}
|
||||
</Nav>
|
||||
</Navbar.Collapse>
|
||||
{
|
||||
currentUser ? <div className='d-none d-md-block me-3'>Привет, {currentUser.name} {currentUser.surname}!</div> : ""
|
||||
}
|
||||
{
|
||||
currentUser ? <button className='btn btn-outline-danger btn-sm d-none d-md-block' onClick={() => { setCurrentUser(null); navigate('/'); }}>Выход</button> : ''
|
||||
}
|
||||
</Container>
|
||||
</Navbar >
|
||||
</header>
|
||||
);
|
||||
};
|
||||
|
||||
Header.propTypes = {
|
||||
routes: PropTypes.array,
|
||||
};
|
||||
|
||||
export default Header;
|
||||
3
src/contexts/CurrentUserContext.js
Normal file
3
src/contexts/CurrentUserContext.js
Normal file
@ -0,0 +1,3 @@
|
||||
import { createContext } from "react";
|
||||
|
||||
export const CurrentUserContext = createContext(null);
|
||||
48
src/hooks/UserHooks.js
Normal file
48
src/hooks/UserHooks.js
Normal file
@ -0,0 +1,48 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import UsersApiService from "../services/UsersApiService";
|
||||
|
||||
export const useUserByUsername = (username) => {
|
||||
const [usersRefresh, setUsersRefresh] = useState(false);
|
||||
const [user, setUser] = useState(null);
|
||||
const handleUsersRefresh = () => setUsersRefresh(!usersRefresh);
|
||||
|
||||
const getUser = async () => {
|
||||
if (!username) {
|
||||
setUser(null);
|
||||
return;
|
||||
}
|
||||
const expand = `?username=${username}`;
|
||||
const data = await UsersApiService.getAll(expand);
|
||||
setUser(data.pop() ?? null);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
getUser();
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [usersRefresh, username]);
|
||||
|
||||
return {
|
||||
user,
|
||||
handleUsersRefresh,
|
||||
};
|
||||
};
|
||||
|
||||
export const useUsers = () => {
|
||||
const [usersRefresh, setUsersRefresh] = useState(false);
|
||||
const [users, setUsers] = useState([]);
|
||||
const handleUsersRefresh = () => setUsersRefresh(!usersRefresh);
|
||||
|
||||
const getUsers = async () => {
|
||||
const data = await UsersApiService.getAll();
|
||||
setUsers(data ?? []);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
getUsers();
|
||||
}, [usersRefresh]);
|
||||
|
||||
return {
|
||||
users,
|
||||
handleUsersRefresh,
|
||||
};
|
||||
};
|
||||
@ -1,68 +0,0 @@
|
||||
:root {
|
||||
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||
line-height: 1.5;
|
||||
font-weight: 400;
|
||||
|
||||
color-scheme: light dark;
|
||||
color: rgba(255, 255, 255, 0.87);
|
||||
background-color: #242424;
|
||||
|
||||
font-synthesis: none;
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
a {
|
||||
font-weight: 500;
|
||||
color: #646cff;
|
||||
text-decoration: inherit;
|
||||
}
|
||||
a:hover {
|
||||
color: #535bf2;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
display: flex;
|
||||
place-items: center;
|
||||
min-width: 320px;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 3.2em;
|
||||
line-height: 1.1;
|
||||
}
|
||||
|
||||
button {
|
||||
border-radius: 8px;
|
||||
border: 1px solid transparent;
|
||||
padding: 0.6em 1.2em;
|
||||
font-size: 1em;
|
||||
font-weight: 500;
|
||||
font-family: inherit;
|
||||
background-color: #1a1a1a;
|
||||
cursor: pointer;
|
||||
transition: border-color 0.25s;
|
||||
}
|
||||
button:hover {
|
||||
border-color: #646cff;
|
||||
}
|
||||
button:focus,
|
||||
button:focus-visible {
|
||||
outline: 4px auto -webkit-focus-ring-color;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: light) {
|
||||
:root {
|
||||
color: #213547;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
a:hover {
|
||||
color: #747bff;
|
||||
}
|
||||
button {
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
}
|
||||
42
src/main.jsx
42
src/main.jsx
@ -1,10 +1,48 @@
|
||||
import 'bootstrap/dist/css/bootstrap.min.css'
|
||||
import { RouterProvider, createBrowserRouter } from 'react-router-dom'
|
||||
import React from 'react'
|
||||
import ReactDOM from 'react-dom/client'
|
||||
import App from './App.jsx'
|
||||
import { Toaster } from 'react-hot-toast'
|
||||
import './index.css'
|
||||
import ErrorPage from './pages/ErrorPage/ErrorPage.jsx'
|
||||
import MainPage from './pages/MainPage/MainPage.jsx'
|
||||
import AuthPage from './pages/AuthPage/AuthPage.jsx'
|
||||
import RegisterPage from './pages/RegisterPage/RegisterPage.jsx'
|
||||
|
||||
const routes = [
|
||||
{
|
||||
index: true,
|
||||
path: '/',
|
||||
element: <MainPage />,
|
||||
title: 'Главная'
|
||||
},
|
||||
{
|
||||
path: '/auth',
|
||||
element: <AuthPage />,
|
||||
title: 'Вход',
|
||||
onlyNoAuthorized: true
|
||||
},
|
||||
{
|
||||
path: '/register',
|
||||
element: <RegisterPage />,
|
||||
title: 'Регистрация',
|
||||
onlyNoAuthorized: true
|
||||
}
|
||||
];
|
||||
|
||||
const router = createBrowserRouter([
|
||||
{
|
||||
path: '/',
|
||||
element: <App routes={routes} />,
|
||||
children: routes,
|
||||
errorElement: <ErrorPage />,
|
||||
},
|
||||
]);
|
||||
|
||||
ReactDOM.createRoot(document.getElementById('root')).render(
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>,
|
||||
<Toaster />
|
||||
<RouterProvider router={router} />
|
||||
</React.StrictMode>
|
||||
)
|
||||
|
||||
103
src/pages/AuthPage/AuthPage.jsx
Normal file
103
src/pages/AuthPage/AuthPage.jsx
Normal file
@ -0,0 +1,103 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import { useContext } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { CurrentUserContext } from "../../contexts/CurrentUserContext";
|
||||
import { getUserByUsernameAndPassword } from "../../utils/UserUtils";
|
||||
|
||||
const AuthPage = () => {
|
||||
const { currentUser, setCurrentUser } = useContext(
|
||||
CurrentUserContext
|
||||
);
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
if (currentUser) {
|
||||
navigate('/');
|
||||
}
|
||||
|
||||
const [inputFields, setInputFields] = useState({
|
||||
username: "",
|
||||
password: ""
|
||||
});
|
||||
|
||||
const [errors, setErrors] = useState({});
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
|
||||
const validateValues = (inputValues) => {
|
||||
let errors = {};
|
||||
if (inputValues.username.length <= 0) {
|
||||
errors.username = "Введите имя пользователя";
|
||||
}
|
||||
if (inputValues.password.length <= 0) {
|
||||
errors.password = "Введите пароль";
|
||||
}
|
||||
return errors;
|
||||
};
|
||||
|
||||
const handleChange = (e) => {
|
||||
setInputFields({ ...inputFields, [e.target.name]: e.target.value });
|
||||
};
|
||||
|
||||
const handleSubmit = async (event) => {
|
||||
event.preventDefault();
|
||||
let errors = validateValues(inputFields);
|
||||
setErrors(errors);
|
||||
if (errors.username == null && errors.password == null) {
|
||||
const user = await getUserByUsernameAndPassword(inputFields.username, inputFields.password);
|
||||
if (!user) {
|
||||
setErrors({
|
||||
form: "Неверные логин или пароль"
|
||||
})
|
||||
}
|
||||
else {
|
||||
setCurrentUser(user);
|
||||
}
|
||||
}
|
||||
setSubmitting(true);
|
||||
};
|
||||
|
||||
const finishSubmit = async () => {
|
||||
navigate('/');
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (Object.keys(errors).length === 0 && submitting && currentUser) {
|
||||
finishSubmit();
|
||||
}
|
||||
}, [errors, submitting, currentUser]);
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="d-flex flex-fill align-items-center justify-content-center">
|
||||
<form onSubmit={handleSubmit} className="d-flex flex-column justify-content-center">
|
||||
<h5 className="text-center">Вход</h5>
|
||||
<div className="mb-3">
|
||||
{errors.form}
|
||||
</div>
|
||||
<div className="mb-3">
|
||||
<input id="username" className="form-control" placeholder="Имя пользователя"
|
||||
type="username"
|
||||
name='username'
|
||||
value={inputFields.username}
|
||||
onChange={handleChange}>
|
||||
</input>
|
||||
{errors.username}
|
||||
</div>
|
||||
<div className="mb-3">
|
||||
<input id="password" className="form-control" placeholder="Пароль"
|
||||
type="password"
|
||||
name='password'
|
||||
value={inputFields.password}
|
||||
onChange={handleChange}
|
||||
>
|
||||
</input>
|
||||
{errors.password}
|
||||
</div>
|
||||
<button type="submit" className="btn btn-success" >Войти</button>
|
||||
</ form>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default AuthPage;
|
||||
31
src/pages/ErrorPage/ErrorPage.jsx
Normal file
31
src/pages/ErrorPage/ErrorPage.jsx
Normal file
@ -0,0 +1,31 @@
|
||||
import { Container } from 'react-bootstrap';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import Header from '../../components/header/header';
|
||||
import Footer from '../../components/footer/footer';
|
||||
|
||||
const ErrorPage = () => {
|
||||
const navigate = useNavigate();
|
||||
return (
|
||||
<>
|
||||
<Header routes={[]}></Header>
|
||||
<Container as="main" className='d-flex justify-content-center align-items-center flex-fill'>
|
||||
<div className='d-flex flex-column align-items-center'>
|
||||
<div className='fs-1'>
|
||||
404
|
||||
</div>
|
||||
<div className='mb-3'>
|
||||
Кажется, вы не туда попали
|
||||
</div>
|
||||
<a className='btn btn-primary' onClick={() => { navigate(-1); }}>
|
||||
Назад
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</Container>
|
||||
<Footer></Footer>
|
||||
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default ErrorPage
|
||||
10
src/pages/MainPage/MainPage.jsx
Normal file
10
src/pages/MainPage/MainPage.jsx
Normal file
@ -0,0 +1,10 @@
|
||||
|
||||
const MainPage = () => {
|
||||
return (
|
||||
<>
|
||||
<h1>Hello world!</h1>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default MainPage
|
||||
167
src/pages/RegisterPage/RegisterPage.jsx
Normal file
167
src/pages/RegisterPage/RegisterPage.jsx
Normal file
@ -0,0 +1,167 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import { useContext } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { CurrentUserContext } from "../../contexts/CurrentUserContext";
|
||||
import { getUserByUsername } from "../../utils/UserUtils";
|
||||
import UsersApiService from "../../services/UsersApiService";
|
||||
import toast from "react-hot-toast";
|
||||
|
||||
const RegisterPage = () => {
|
||||
const { currentUser, setCurrentUser } = useContext(
|
||||
CurrentUserContext
|
||||
);
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
if (currentUser) {
|
||||
navigate('/');
|
||||
}
|
||||
|
||||
const [inputFields, setInputFields] = useState({
|
||||
username: "",
|
||||
password: "",
|
||||
name: "",
|
||||
surname: "",
|
||||
confirmPassword: "",
|
||||
isTeacher: false
|
||||
});
|
||||
|
||||
const [errors, setErrors] = useState({});
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
|
||||
const validateValues = (inputValues) => {
|
||||
let errors = {};
|
||||
if (inputValues.username.length <= 0) {
|
||||
errors.username = "Введите имя пользователя";
|
||||
}
|
||||
if (inputValues.password.length <= 0) {
|
||||
errors.password = "Введите пароль";
|
||||
}
|
||||
if (inputValues.name.length <= 0) {
|
||||
errors.name = "Введите имя";
|
||||
}
|
||||
if (inputValues.surname.length <= 0) {
|
||||
errors.surname = "Введите фамилию";
|
||||
}
|
||||
if (inputValues.password != inputValues.confirmPassword) {
|
||||
errors.confirmPassword = "Пароли не совпадают";
|
||||
}
|
||||
return errors;
|
||||
};
|
||||
|
||||
const handleChange = (e) => {
|
||||
setInputFields({ ...inputFields, [e.target.name]: e.target.value });
|
||||
};
|
||||
|
||||
const handleSubmit = async (event) => {
|
||||
event.preventDefault();
|
||||
let errors = validateValues(inputFields);
|
||||
setErrors(errors);
|
||||
if (Object.keys(errors).length === 0) {
|
||||
let user = await getUserByUsername(inputFields.username);
|
||||
if (user) {
|
||||
setErrors({
|
||||
username: "Логин уже занят"
|
||||
})
|
||||
}
|
||||
else {
|
||||
await UsersApiService.create({
|
||||
name: inputFields.name,
|
||||
surname: inputFields.surname,
|
||||
username: inputFields.username,
|
||||
password: inputFields.password,
|
||||
isTeacher: inputFields.isTeacher,
|
||||
groupId: 1
|
||||
});
|
||||
toast.success('Пользователь зарегистрирован!');
|
||||
}
|
||||
}
|
||||
setSubmitting(true);
|
||||
};
|
||||
|
||||
const finishSubmit = async () => {
|
||||
navigate('/');
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (Object.keys(errors).length === 0 && submitting) {
|
||||
finishSubmit();
|
||||
}
|
||||
}, [errors, submitting, currentUser]);
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="d-flex flex-fill align-items-center justify-content-center">
|
||||
<form onSubmit={handleSubmit} className="d-flex flex-column justify-content-center">
|
||||
<h5 className="text-center">Регистрация</h5>
|
||||
<div className="mb-3">
|
||||
{errors.form}
|
||||
</div>
|
||||
<div className="mb-3 d-flex">
|
||||
<div className="me-3">
|
||||
<input id="name" className="form-control" placeholder="Имя"
|
||||
type="text"
|
||||
name='name'
|
||||
value={inputFields.name}
|
||||
onChange={handleChange}>
|
||||
</input>
|
||||
{errors.name}
|
||||
</div>
|
||||
<div>
|
||||
<input id="surname" className="form-control" placeholder="Фамилия"
|
||||
type="text"
|
||||
name='surname'
|
||||
value={inputFields.surname}
|
||||
onChange={handleChange}>
|
||||
</input>
|
||||
{errors.surname}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="mb-3">
|
||||
<input id="username" className="form-control" placeholder="Имя пользователя"
|
||||
type="username"
|
||||
name='username'
|
||||
value={inputFields.username}
|
||||
onChange={handleChange}>
|
||||
</input>
|
||||
{errors.username}
|
||||
</div>
|
||||
<div className="mb-3">
|
||||
<input id="password" className="form-control" placeholder="Пароль"
|
||||
type="password"
|
||||
name='password'
|
||||
value={inputFields.password}
|
||||
onChange={handleChange}
|
||||
>
|
||||
</input>
|
||||
{errors.password}
|
||||
</div>
|
||||
<div className="mb-3">
|
||||
<input id="confirmPassword" className="form-control" placeholder="Повторите пароль"
|
||||
type="password"
|
||||
name='confirmPassword'
|
||||
value={inputFields.confirmPassword}
|
||||
onChange={handleChange}
|
||||
>
|
||||
</input>
|
||||
{errors.confirmPassword}
|
||||
</div>
|
||||
<div className="mb-3 d-flex align-items-center">
|
||||
<input id="isTeacher" className="me-2"
|
||||
type="checkbox"
|
||||
name='isTeacher'
|
||||
value={inputFields.isTeacher}
|
||||
onChange={handleChange}
|
||||
>
|
||||
</input>
|
||||
<label htmlFor="isTeacher">Я преподаватель</label>
|
||||
</div>
|
||||
<button id="btn-register-submit" type="submit" className="btn btn-primary" >Зарегистрироваться</button>
|
||||
</ form>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default RegisterPage;
|
||||
5
src/services/UsersApiService.js
Normal file
5
src/services/UsersApiService.js
Normal file
@ -0,0 +1,5 @@
|
||||
import ApiService from "../api/ApiService.js";
|
||||
|
||||
const UsersApiService = new ApiService("users");
|
||||
|
||||
export default UsersApiService;
|
||||
23
src/utils/UserUtils.js
Normal file
23
src/utils/UserUtils.js
Normal file
@ -0,0 +1,23 @@
|
||||
import UsersApiService from "../services/UsersApiService";
|
||||
|
||||
export async function getUserByUsername(username) {
|
||||
const expand = `?username=${username}`;
|
||||
const users = await UsersApiService.getAll(expand);
|
||||
if (users) {
|
||||
if (users.length == 1) {
|
||||
return users[0];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export async function getUserByUsernameAndPassword(username, password) {
|
||||
const expand = `?username=${username}&password=${password}`;
|
||||
const users = await UsersApiService.getAll(expand);
|
||||
if (users) {
|
||||
if (users.length == 1) {
|
||||
return users[0];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user