._.
This commit is contained in:
parent
e345488763
commit
4c8aa58301
24
src/App.jsx
24
src/App.jsx
@ -1,18 +1,18 @@
|
||||
import React from 'react';
|
||||
import RoutesComponent from './AppRouter.jsx';
|
||||
import { AuthProvider } from './AuthContext.jsx';
|
||||
import { BrowserRouter as Router } from 'react-router-dom';
|
||||
import React from "react";
|
||||
import RoutesComponent from "./AppRouter.jsx";
|
||||
import { AuthProvider } from "./AuthContext.jsx";
|
||||
import { BrowserRouter as Router } from "react-router-dom";
|
||||
|
||||
const App = () => {
|
||||
return (
|
||||
return (
|
||||
<Router>
|
||||
<AuthProvider>
|
||||
<div>
|
||||
<RoutesComponent />
|
||||
</div>
|
||||
</AuthProvider>
|
||||
<AuthProvider>
|
||||
<div>
|
||||
<RoutesComponent />
|
||||
</div>
|
||||
</AuthProvider>
|
||||
</Router>
|
||||
);
|
||||
);
|
||||
};
|
||||
|
||||
export default App;
|
||||
export default App;
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
import { Routes, Route, Navigate } from 'react-router-dom';
|
||||
import Login from './pages/Login';
|
||||
import PrivateRoute from './components/PrivateRoute';
|
||||
import { Routes, Route, Navigate } from "react-router-dom";
|
||||
import Login from "./pages/Login";
|
||||
import Home from "./pages/Home.jsx";
|
||||
import PrivateRoute from "./components/PrivateRoute";
|
||||
|
||||
const RoutesComponent = () => (
|
||||
<Routes>
|
||||
<Route path="/login" element={<Login />} />
|
||||
<Route element={<PrivateRoute />}>
|
||||
<Route path='/' />
|
||||
</Route>
|
||||
</Routes>
|
||||
<Routes>
|
||||
<Route path="/login" element={<Login />} />
|
||||
<Route element={<PrivateRoute />}>
|
||||
<Route path="/" element={<Home />} />
|
||||
</Route>
|
||||
</Routes>
|
||||
);
|
||||
|
||||
export default RoutesComponent;
|
||||
|
||||
@ -1,34 +1,34 @@
|
||||
import React, { createContext, useContext, useState, useEffect } from 'react';
|
||||
import React, { createContext, useContext, useState, useEffect } from "react";
|
||||
|
||||
const AuthContext = createContext();
|
||||
|
||||
export const useAuth = () => {
|
||||
return useContext(AuthContext);
|
||||
return useContext(AuthContext);
|
||||
};
|
||||
|
||||
export const AuthProvider = ({ children }) => {
|
||||
const [isAuthenticated, setIsAuthenticated] = useState(() => {
|
||||
const savedAuth = localStorage.getItem('isAuthenticated');
|
||||
return savedAuth === 'true';
|
||||
});
|
||||
const [isAuthenticated, setIsAuthenticated] = useState(() => {
|
||||
const savedAuth = localStorage.getItem("isAuthenticated");
|
||||
return savedAuth === "true";
|
||||
});
|
||||
|
||||
const login = () => {
|
||||
setIsAuthenticated(true);
|
||||
};
|
||||
const login = () => {
|
||||
setIsAuthenticated(true);
|
||||
};
|
||||
|
||||
const logout = () => {
|
||||
setIsAuthenticated(false);
|
||||
localStorage.removeItem('token');
|
||||
localStorage.removeItem('isAuthenticated');
|
||||
};
|
||||
const logout = () => {
|
||||
setIsAuthenticated(false);
|
||||
localStorage.removeItem("token");
|
||||
localStorage.removeItem("isAuthenticated");
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
localStorage.setItem('isAuthenticated', isAuthenticated);
|
||||
}, [isAuthenticated]);
|
||||
useEffect(() => {
|
||||
localStorage.setItem("isAuthenticated", isAuthenticated);
|
||||
}, [isAuthenticated]);
|
||||
|
||||
return (
|
||||
<AuthContext.Provider value={{ isAuthenticated, login, logout }}>
|
||||
{children}
|
||||
</AuthContext.Provider>
|
||||
);
|
||||
return (
|
||||
<AuthContext.Provider value={{ isAuthenticated, login, logout }}>
|
||||
{children}
|
||||
</AuthContext.Provider>
|
||||
);
|
||||
};
|
||||
|
||||
72
src/api.jsx
72
src/api.jsx
@ -1,44 +1,50 @@
|
||||
import axios from 'axios';
|
||||
import axios from "axios";
|
||||
|
||||
const API_URL = 'http://localhost:8000/api';
|
||||
const API_URL = "http://localhost:8000/api";
|
||||
|
||||
const getAuthToken = () => {
|
||||
return localStorage.getItem('token');
|
||||
return localStorage.getItem("token");
|
||||
};
|
||||
|
||||
export const loginUser = async (loginData) => {
|
||||
const params = new URLSearchParams();
|
||||
params.append('grant_type', 'password');
|
||||
params.append('username', loginData.login);
|
||||
params.append('password', loginData.password);
|
||||
const params = new URLSearchParams();
|
||||
params.append("grant_type", "password");
|
||||
params.append("username", loginData.login);
|
||||
params.append("password", loginData.password);
|
||||
|
||||
try {
|
||||
const response = await axios.post(`${API_URL}/token`, params, {
|
||||
headers: {
|
||||
'Content-Type': 'application/x-www-form-urlencoded',
|
||||
'Accept': 'application/json',
|
||||
},
|
||||
});
|
||||
console.log(response.data);
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
console.log('Ошибка при запросе:', error.response ? error.response.data : error);
|
||||
throw error.response ? error.response.data : error;
|
||||
}
|
||||
try {
|
||||
const response = await axios.post(`${API_URL}/token`, params, {
|
||||
headers: {
|
||||
"Content-Type": "application/x-www-form-urlencoded",
|
||||
Accept: "application/json",
|
||||
},
|
||||
});
|
||||
console.log(response.data);
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
console.log(
|
||||
"Ошибка при запросе:",
|
||||
error.response ? error.response.data : error
|
||||
);
|
||||
throw error.response ? error.response.data : error;
|
||||
}
|
||||
};
|
||||
|
||||
export const getAccessories = async () => {
|
||||
try {
|
||||
const token = getAuthToken();
|
||||
const response = await axios.get(`${API_URL}/accessories`, {
|
||||
headers: {
|
||||
'Authorization': `Bearer ${token}`,
|
||||
'Accept': 'application/json',
|
||||
},
|
||||
});
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
console.error('Ошибка при запросе аксессуаров:', error.response ? error.response.data : error);
|
||||
throw error.response ? error.response.data : error;
|
||||
}
|
||||
try {
|
||||
const token = getAuthToken();
|
||||
const response = await axios.get(`${API_URL}/accessories`, {
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`,
|
||||
Accept: "application/json",
|
||||
},
|
||||
});
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
console.error(
|
||||
"Ошибка при запросе аксессуаров:",
|
||||
error.response ? error.response.data : error
|
||||
);
|
||||
throw error.response ? error.response.data : error;
|
||||
}
|
||||
};
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
import React from 'react';
|
||||
import { Navigate, Outlet } from 'react-router-dom';
|
||||
import { useAuth } from '../AuthContext.jsx';
|
||||
import React from "react";
|
||||
import { Navigate, Outlet } from "react-router-dom";
|
||||
import { useAuth } from "../AuthContext.jsx";
|
||||
|
||||
const PrivateRoute = () => {
|
||||
const { isAuthenticated } = useAuth();
|
||||
const { isAuthenticated } = useAuth();
|
||||
|
||||
if (isAuthenticated === null) {
|
||||
return <div>Loading...</div>;
|
||||
}
|
||||
if (isAuthenticated === null) {
|
||||
return <div>Loading...</div>;
|
||||
}
|
||||
|
||||
return isAuthenticated ? <Outlet /> : <Navigate to="/login" />;
|
||||
return isAuthenticated ? <Outlet /> : <Navigate to="/login" />;
|
||||
};
|
||||
|
||||
export default PrivateRoute;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom/client';
|
||||
import App from './App';
|
||||
import React from "react";
|
||||
import ReactDOM from "react-dom/client";
|
||||
import App from "./App";
|
||||
|
||||
const root = ReactDOM.createRoot(document.getElementById('root'));
|
||||
const root = ReactDOM.createRoot(document.getElementById("root"));
|
||||
root.render(
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>
|
||||
);
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>
|
||||
);
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import React, { useState, useEffect } from "react";
|
||||
|
||||
const Home = () => {
|
||||
return <div>sadvsgrhgrtshte</div>;
|
||||
};
|
||||
|
||||
return (
|
||||
<div>
|
||||
sadvsgrhgrtshte
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default Home;
|
||||
|
||||
@ -1,59 +1,61 @@
|
||||
import React, { useState } from 'react';
|
||||
import { loginUser } from '../api';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useAuth } from '../AuthContext'; // Подключаем AuthContext
|
||||
import React, { useState } from "react";
|
||||
import { loginUser } from "../api";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { useAuth } from "../AuthContext";
|
||||
|
||||
const Login = () => {
|
||||
const [login, setLogin] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
const navigate = useNavigate();
|
||||
const { login: authenticate } = useAuth(); // Вытаскиваем метод login из контекста
|
||||
const [login, setLogin] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [error, setError] = useState("");
|
||||
const navigate = useNavigate();
|
||||
const { login: authenticate } = useAuth();
|
||||
|
||||
const handleSubmit = async (e) => {
|
||||
e.preventDefault();
|
||||
const handleSubmit = async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
try {
|
||||
const userData = await loginUser({ login, password });
|
||||
localStorage.setItem('token', userData.access_token);
|
||||
authenticate();
|
||||
navigate('/');
|
||||
} catch (error) {
|
||||
setError(error.detail ? error.detail : 'Ошибка авторизации');
|
||||
}
|
||||
};
|
||||
try {
|
||||
const userData = await loginUser({ login, password });
|
||||
localStorage.setItem("token", userData.access_token);
|
||||
authenticate();
|
||||
navigate("/");
|
||||
} catch (error) {
|
||||
setError(error.detail ? error.detail : "Ошибка авторизации");
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="container mt-5">
|
||||
<h2 className="text-center">Вход</h2>
|
||||
{error && <p className="text-danger text-center">{error}</p>}
|
||||
<form onSubmit={handleSubmit} className="border p-4 rounded shadow">
|
||||
<div className="form-group">
|
||||
<label htmlFor="login">Логин</label>
|
||||
<input
|
||||
type="text"
|
||||
id="login"
|
||||
className="form-control"
|
||||
value={login}
|
||||
onChange={(e) => setLogin(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<div className="form-group">
|
||||
<label htmlFor="password">Пароль</label>
|
||||
<input
|
||||
type="password"
|
||||
id="password"
|
||||
className="form-control"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<button type="submit" className="btn btn-primary btn-block">Войти</button>
|
||||
</form>
|
||||
return (
|
||||
<div className="container mt-5">
|
||||
<h2 className="text-center">Вход</h2>
|
||||
{error && <p className="text-danger text-center">{error}</p>}
|
||||
<form onSubmit={handleSubmit} className="border p-4 rounded shadow">
|
||||
<div className="form-group">
|
||||
<label htmlFor="login">Логин</label>
|
||||
<input
|
||||
type="text"
|
||||
id="login"
|
||||
className="form-control"
|
||||
value={login}
|
||||
onChange={(e) => setLogin(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
<div className="form-group">
|
||||
<label htmlFor="password">Пароль</label>
|
||||
<input
|
||||
type="password"
|
||||
id="password"
|
||||
className="form-control"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<button type="submit" className="btn btn-primary btn-block">
|
||||
Войти
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default Login;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user