Index: backend/auth_form/serializers.py
===================================================================
--- backend/auth_form/serializers.py (revision 0613e8c340f539890be23089c8b2bd9bdebc8929)
+++ backend/auth_form/serializers.py (revision 8f179866a26b7365968f0fff5f192672bc20d82b)
@@ -66,5 +66,5 @@
return data
else:
- serializers.ValidationError('Must include "email" and "password"')
+ raise serializers.ValidationError('Must include "email" and "password"')
class StudentFormSerializer(serializers.ModelSerializer):
Index: backend/auth_form/views.py
===================================================================
--- backend/auth_form/views.py (revision 0613e8c340f539890be23089c8b2bd9bdebc8929)
+++ backend/auth_form/views.py (revision 8f179866a26b7365968f0fff5f192672bc20d82b)
@@ -56,5 +56,5 @@
if self.request.method=='POST':
return [IsAuthenticated(), CanSubmitForm(), IsStudent()]
- elif self.request.method == 'PUT':
+ elif self.request.method == 'PATCH':
return [IsAuthenticated(), IsStudent(), CanUpdateForm()]
return [IsAuthenticated(), IsStudent()]
Index: frontend/src/components/LogoutButton.tsx
===================================================================
--- frontend/src/components/LogoutButton.tsx (revision 0613e8c340f539890be23089c8b2bd9bdebc8929)
+++ frontend/src/components/LogoutButton.tsx (revision 8f179866a26b7365968f0fff5f192672bc20d82b)
@@ -1,9 +1,11 @@
import React from "react";
import { useNavigate } from "react-router-dom";
+import { useAuth } from "../hooks/useAuth";
const LogoutButton: React.FC = () => {
const navigate = useNavigate();
+ const { logout } = useAuth();
const handleLogout = () => {
- localStorage.removeItem("token");
+ logout()
navigate("/login");
};
Index: frontend/src/components/Navbar.tsx
===================================================================
--- frontend/src/components/Navbar.tsx (revision 0613e8c340f539890be23089c8b2bd9bdebc8929)
+++ frontend/src/components/Navbar.tsx (revision 8f179866a26b7365968f0fff5f192672bc20d82b)
@@ -6,136 +6,138 @@
const Navbar: React.FC = () => {
- const [menuOpen, setMenuOpen] = useState(false);
- const { isAuthenticated, logout } = useAuth();
- const navigate = useNavigate();
- const { login } = useAuth();
+ const [menuOpen, setMenuOpen] = useState(false);
+ const { isAuthenticated, logout } = useAuth();
+ const navigate = useNavigate();
+ const { login } = useAuth();
- const handleLogout = () => {
- logout();
- navigate("/");
- };
+ const handleLogout = () => {
+ logout();
+ navigate("/");
+ };
- const testAccountLogin = async () => {
- if (isAuthenticated) return;
- try {
- const response = await axios.post("http://localhost:8000/auth/login/", {
- email: "fffff@finki.ukim.mk",
- password: "testTestTEST123",
- });
- const { access, refresh } = response.data;
- login(access, refresh);
- navigate("/");
- } catch (err: unknown) {
- console.log(err);
- }
- };
+ const testAccountLogin = async () => {
+ if (isAuthenticated) return;
+ try {
+ const response = await axios.post("http://localhost:8000/auth/login/", {
+ email: "fffff@finki.ukim.mk",
+ password: "testTestTEST123",
+ });
+ const { access, refresh } = response.data;
+ login(access, refresh);
+ navigate("/");
+ } catch (err: unknown) {
+ console.log(err);
+ }
+ };
- return (
-
- );
+ {menuOpen && (
+
+
+ Предмети
+
+ {isAuthenticated && (
+
+ Профил
+
+ )}
+ {isAuthenticated ? (
+
+ ) : (
+ <>
+ setMenuOpen(false)}>
+ Најави се
+
+ setMenuOpen(false)}>
+ Регистрирај се
+
+
+ )}
+
+ )}
+
+ );
};
Index: frontend/src/context/AuthProvider.tsx
===================================================================
--- frontend/src/context/AuthProvider.tsx (revision 0613e8c340f539890be23089c8b2bd9bdebc8929)
+++ frontend/src/context/AuthProvider.tsx (revision 8f179866a26b7365968f0fff5f192672bc20d82b)
@@ -12,5 +12,4 @@
localStorage.getItem("refresh_token")
);
-
const refreshAccessToken = async (): Promise => {
const refreshToken = localStorage.getItem("refresh_token");
@@ -21,5 +20,5 @@
try {
const response = await axiosInstance.post<{ access: string; refresh?: string }>(
- "http://localhost:8000/auth/refresh/",
+ "/auth/refresh/",
{ refresh: refreshToken }
);
@@ -38,5 +37,6 @@
} catch (error) {
console.error("Error refreshing access token:", error);
- return Promise.reject(error); // Propagate the error
+ logout();
+ return null;
}
};
Index: frontend/src/pages/Account.tsx
===================================================================
--- frontend/src/pages/Account.tsx (revision 0613e8c340f539890be23089c8b2bd9bdebc8929)
+++ frontend/src/pages/Account.tsx (revision 8f179866a26b7365968f0fff5f192672bc20d82b)
@@ -27,5 +27,5 @@
// probably navigate the user away.
console.error("Could not fetch form data after retries.", error);
- navigate("/login");
+ //navigate("/login");
} finally {
// This will run whether the request succeeded or failed.
Index: frontend/src/pages/Recommendations.tsx
===================================================================
--- frontend/src/pages/Recommendations.tsx (revision 0613e8c340f539890be23089c8b2bd9bdebc8929)
+++ frontend/src/pages/Recommendations.tsx (revision 8f179866a26b7365968f0fff5f192672bc20d82b)
@@ -1,25 +1,17 @@
import { useState } from "react";
import { Subject } from "../components/types";
-import { useAuth } from "../hooks/useAuth";
+import useAxiosAuth from "../hooks/useAxiosAuth";
const Recommendations = () => {
- const { accessToken } = useAuth();
+ const axiosAuth = useAxiosAuth();
const [recommendations, setRecommendations] = useState([]);
const testAPI = async () => {
- const start = performance.now();
- console.log("fetching...");
- fetch("http://localhost:8000/suggestion/", {
- method: "GET",
- headers: {
- Authorization: `Bearer ${accessToken}`,
- "Content-Type": "application/json",
- },
- })
- .then((res) => res.json())
- .then((data) => {
- console.log(data.data);
- setRecommendations(data.data);
- console.log((performance.now() - start) / 1000);
- });
+ try {
+ const response = await axiosAuth.get("/suggestion");
+ setRecommendations(response.data.data);
+ }
+ catch (error) {
+ console.error("Error fetching recommendations:", error);
+ }
};