diff --git a/src/AuthContext.jsx b/src/AuthContext.jsx index a24c42b..4b403cb 100644 --- a/src/AuthContext.jsx +++ b/src/AuthContext.jsx @@ -11,19 +11,19 @@ export const AuthProvider = ({ children }) => { const savedAuth = localStorage.getItem("isAuthenticated"); return savedAuth === "true"; }); - const [user, setUser] = useState(null); const login = (userData) => { setIsAuthenticated(true); - setUser(userData); localStorage.setItem("token", userData.token); + localStorage.setItem("user", JSON.stringify(userData.user)); + localStorage.setItem("isAuthenticated", true); }; const logout = () => { setIsAuthenticated(false); - setUser(null); localStorage.removeItem("token"); localStorage.removeItem("isAuthenticated"); + localStorage.removeItem("user"); }; useEffect(() => { @@ -31,7 +31,7 @@ export const AuthProvider = ({ children }) => { }, [isAuthenticated]); return ( - + {children} ); diff --git a/src/api.jsx b/src/api.jsx index 5b50b43..fc873f9 100755 --- a/src/api.jsx +++ b/src/api.jsx @@ -19,7 +19,11 @@ export const loginUser = async (loginData) => { Accept: "application/json", }, }); - return response.data; + + return { + token: response.data.access_token, + user: response.data.user, + }; } catch (error) { console.log( "Ошибка при запросе:", @@ -28,22 +32,3 @@ export const loginUser = async (loginData) => { 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; - } -}; diff --git a/src/components/Header.jsx b/src/components/Header.jsx index 7ea9b37..056e6df 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -3,8 +3,9 @@ import { Link, useNavigate } from "react-router-dom"; import { useAuth } from "../AuthContext"; const Header = () => { - const { isAuthenticated, logout, user } = useAuth(); + const { isAuthenticated, logout } = useAuth(); const navigate = useNavigate(); + const user = JSON.parse(localStorage.getItem("user")); const handleLogout = () => { logout(); @@ -29,7 +30,7 @@ const Header = () => {
{isAuthenticated ? (
- {user?.user.login}{" "} + {user?.login}{" "}