-
+
} />
}>
@@ -40,8 +100,7 @@ const App = () => {
}>
} />
- } />
- } />
+ } />
diff --git a/frontend/src/PrivateRoute.jsx b/frontend/src/PrivateRoute.jsx
index defeaea..01afc6a 100644
--- a/frontend/src/PrivateRoute.jsx
+++ b/frontend/src/PrivateRoute.jsx
@@ -1,11 +1,9 @@
-import React from "react";
import { Navigate, Outlet } from "react-router-dom";
-import { useAuth } from "./hooks/authentication/IsAuthenticated";
+import { useAuth } from "src/hooks/AuthHooks";
const PrivateRoute = () => {
- const { isAuthenticated, setIsAuthenticated } = useAuth();
- const auth = isAuthenticated;
- return auth ?
:
;
+ const { isAuthenticated } = useAuth();
+ return isAuthenticated ?
:
;
};
-export default PrivateRoute;
\ No newline at end of file
+export default PrivateRoute;
diff --git a/frontend/src/PublicRoute.jsx b/frontend/src/PublicRoute.jsx
new file mode 100644
index 0000000..ffdc39c
--- /dev/null
+++ b/frontend/src/PublicRoute.jsx
@@ -0,0 +1,9 @@
+import { Navigate, Outlet } from "react-router-dom";
+import { useAuth } from "src/hooks/AuthHooks";
+
+const PublicRoute = () => {
+ const { isAuthenticated } = useAuth();
+ return isAuthenticated ?
:
;
+};
+
+export default PublicRoute;
diff --git a/frontend/src/api/AuthenticationApi.jsx b/frontend/src/api/AuthenticationApi.jsx
index d4b6486..bca81d5 100644
--- a/frontend/src/api/AuthenticationApi.jsx
+++ b/frontend/src/api/AuthenticationApi.jsx
@@ -1,15 +1,18 @@
import axios from "axios";
-import axiosInstance from "./configs/AxiosConfig";
+import axiosInstance from "./AxiosConfig";
+
+const baseURL = import.meta.env.VITE_BASE_URL;
// Function for user login
-const apiUserLogin = data => {
+const apiUserLogin = (data) => {
return axiosInstance
.post("token/obtain/", data)
- .then(response => {
+ .then((response) => {
console.log(response.statusText);
+
return response;
})
- .catch(error => {
+ .catch((error) => {
console.log("apiUserLogin error: ", error);
return error;
});
@@ -23,9 +26,9 @@ const apiUserLogout = () => {
};
// Function for Google login
-const googleLogin = async token => {
+const googleLogin = async (token) => {
axios.defaults.withCredentials = true;
- let res = await axios.post("http://localhost:8000/api/auth/google/", {
+ let res = await axios.post(`${baseURL}auth/google/`, {
code: token,
});
// console.log('service google login res: ', res);
@@ -36,29 +39,23 @@ const googleLogin = async token => {
const getGreeting = () => {
return axiosInstance
.get("hello")
- .then(response => {
+ .then((response) => {
return response;
})
- .catch(error => {
+ .catch((error) => {
return error;
});
};
-const config = {
- headers: {
- "Content-Type": "application/json",
- },
-};
-
// Function to register
-const createUser = async formData => {
+const createUser = async (formData) => {
try {
axios.defaults.withCredentials = true;
- const resposne = axios.post("http://localhost:8000/api/user/create/", formData);
+ const response = axios.post(`${baseURL}user/create/`, formData);
// const response = await axiosInstance.post('/user/create/', formData);
return response.data;
- } catch (error) {
- throw error;
+ } catch (e) {
+ console.log(e);
}
};
diff --git a/frontend/src/api/AxiosConfig.jsx b/frontend/src/api/AxiosConfig.jsx
new file mode 100644
index 0000000..b037386
--- /dev/null
+++ b/frontend/src/api/AxiosConfig.jsx
@@ -0,0 +1,47 @@
+import axios from "axios";
+import { redirect } from "react-router-dom";
+
+const baseURL = import.meta.env.VITE_BASE_URL;
+
+const axiosInstance = axios.create({
+ baseURL: baseURL,
+ timeout: 5000,
+ headers: {
+ Authorization: "Bearer " + localStorage.getItem("access_token"),
+ "Content-Type": "application/json",
+ accept: "application/json",
+ },
+});
+
+// handling token refresh on 401 Unauthorized errors
+axiosInstance.interceptors.response.use(
+ (response) => response,
+ (error) => {
+ const originalRequest = error.config;
+ const refresh_token = localStorage.getItem("refresh_token");
+
+ // Check if the error is due to 401 and a refresh token is available
+ if (error.response && error.response.status === 401) {
+ if (refresh_token) {
+ return axiosInstance
+ .post("/token/refresh/", { refresh: refresh_token })
+ .then((response) => {
+ localStorage.setItem("access_token", response.data.access);
+
+ axiosInstance.defaults.headers["Authorization"] = "Bearer " + response.data.access;
+ originalRequest.headers["Authorization"] = "Bearer " + response.data.access;
+
+ return axiosInstance(originalRequest);
+ })
+ .catch((err) => {
+ console.log("Interceptors error: ", err);
+ });
+ } else {
+ redirect("/login");
+ }
+ }
+ return Promise.reject(error);
+ }
+);
+
+export default axiosInstance;
diff --git a/frontend/src/api/TaskApi.jsx b/frontend/src/api/TaskApi.jsx
index eee70d0..daad9c3 100644
--- a/frontend/src/api/TaskApi.jsx
+++ b/frontend/src/api/TaskApi.jsx
@@ -1,21 +1,21 @@
-import axiosInstance from "./configs/AxiosConfig";
+import axiosInstance from "src/api/AxiosConfig";
-const baseURL = "";
+const baseURL = import.meta.env.VITE_BASE_URL;
export const createTask = (endpoint, data) => {
return axiosInstance
.post(`${baseURL}${endpoint}/`, data)
- .then(response => response.data)
- .catch(error => {
+ .then((response) => response.data)
+ .catch((error) => {
throw error;
});
};
-export const readTasks = endpoint => {
+export const readTasks = (endpoint) => {
return axiosInstance
.get(`${baseURL}${endpoint}/`)
- .then(response => response.data)
- .catch(error => {
+ .then((response) => response.data)
+ .catch((error) => {
throw error;
});
};
@@ -23,8 +23,8 @@ export const readTasks = endpoint => {
export const readTaskByID = (endpoint, id) => {
return axiosInstance
.get(`${baseURL}${endpoint}/${id}/`)
- .then(response => response.data)
- .catch(error => {
+ .then((response) => response.data)
+ .catch((error) => {
throw error;
});
};
@@ -32,8 +32,8 @@ export const readTaskByID = (endpoint, id) => {
export const updateTask = (endpoint, id, data) => {
return axiosInstance
.put(`${baseURL}${endpoint}/${id}/`, data)
- .then(response => response.data)
- .catch(error => {
+ .then((response) => response.data)
+ .catch((error) => {
throw error;
});
};
@@ -41,16 +41,16 @@ export const updateTask = (endpoint, id, data) => {
export const deleteTask = (endpoint, id) => {
return axiosInstance
.delete(`${baseURL}${endpoint}/${id}/`)
- .then(response => response.data)
- .catch(error => {
+ .then((response) => response.data)
+ .catch((error) => {
throw error;
});
};
// Create
-export const createTodoTask = data => createTask("todo", data);
-export const createRecurrenceTask = data => createTask("daily", data);
-export const createHabitTask = data => createTask("habit", data);
+export const createTodoTask = (data) => createTask("todo", data);
+export const createRecurrenceTask = (data) => createTask("daily", data);
+export const createHabitTask = (data) => createTask("habit", data);
// Read
export const readTodoTasks = () => readTasks("todo");
@@ -58,9 +58,9 @@ export const readRecurrenceTasks = () => readTasks("daily");
export const readHabitTasks = () => readTasks("habit");
// Read by ID
-export const readTodoTaskByID = id => readTaskByID("todo", id);
-export const readRecurrenceTaskByID = id => readTaskByID("daily", id);
-export const readHabitTaskByID = id => readTaskByID("habit", id);
+export const readTodoTaskByID = (id) => readTaskByID("todo", id);
+export const readRecurrenceTaskByID = (id) => readTaskByID("daily", id);
+export const readHabitTaskByID = (id) => readTaskByID("habit", id);
// Update
export const updateTodoTask = (id, data) => updateTask("todo", id, data);
@@ -68,6 +68,6 @@ export const updateRecurrenceTask = (id, data) => updateTask("daily", id, data);
export const updateHabitTask = (id, data) => updateTask("habit", id, data);
// Delete
-export const deleteTodoTask = id => deleteTask("todo", id);
-export const deleteRecurrenceTask = id => deleteTask("daily", id);
-export const deleteHabitTask = id => deleteTask("habit", id);
+export const deleteTodoTask = (id) => deleteTask("todo", id);
+export const deleteRecurrenceTask = (id) => deleteTask("daily", id);
+export const deleteHabitTask = (id) => deleteTask("habit", id);
diff --git a/frontend/src/api/UserProfileApi.jsx b/frontend/src/api/UserProfileApi.jsx
index e7a1b17..6dfc050 100644
--- a/frontend/src/api/UserProfileApi.jsx
+++ b/frontend/src/api/UserProfileApi.jsx
@@ -1,8 +1,10 @@
import axios from "axios";
-const ApiUpdateUserProfile = async formData => {
+const baseURL = import.meta.env.VITE_BASE_URL;
+
+const ApiUpdateUserProfile = async (formData) => {
try {
- const response = await axios.post("http://127.0.1:8000/api/user/update/", formData, {
+ const response = await axios.post(`${baseURL}user/update/`, formData, {
headers: {
Authorization: "Bearer " + localStorage.getItem("access_token"),
"Content-Type": "multipart/form-data",
diff --git a/frontend/src/api/configs/AxiosConfig.jsx b/frontend/src/api/configs/AxiosConfig.jsx
deleted file mode 100644
index b0410d1..0000000
--- a/frontend/src/api/configs/AxiosConfig.jsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import axios from "axios";
-import { redirect } from "react-router-dom";
-
-const axiosInstance = axios.create({
- baseURL: "http://127.0.0.1:8000/api/",
- timeout: 5000,
- headers: {
- Authorization: "Bearer " + localStorage.getItem("access_token"),
- "Content-Type": "application/json",
- accept: "application/json",
- },
-});
-
-// handling token refresh on 401 Unauthorized errors
-axiosInstance.interceptors.response.use(
- response => response,
- error => {
- const originalRequest = error.config;
- const refresh_token = localStorage.getItem("refresh_token");
-
- // Check if the error is due to 401 and a refresh token is available
- if (
- error.response.status === 401 &&
- error.response.statusText === "Unauthorized" &&
- refresh_token !== "undefined"
- ) {
- return axiosInstance
- .post("/token/refresh/", { refresh: refresh_token })
- .then(response => {
- localStorage.setItem("access_token", response.data.access);
-
- axiosInstance.defaults.headers["Authorization"] = "Bearer " + response.data.access;
- originalRequest.headers["Authorization"] = "Bearer " + response.data.access;
-
- return axiosInstance(originalRequest);
- })
- .catch(err => {
- console.log("Interceptors error: ", err);
- });
- }
- return Promise.reject(error);
- }
-);
-
-export default axiosInstance;
diff --git a/frontend/src/components/EisenhowerMatrix/Eisenhower.jsx b/frontend/src/components/EisenhowerMatrix/Eisenhower.jsx
index 374ac66..619dca9 100644
--- a/frontend/src/components/EisenhowerMatrix/Eisenhower.jsx
+++ b/frontend/src/components/EisenhowerMatrix/Eisenhower.jsx
@@ -1,14 +1,14 @@
import React, { useState, useEffect } from "react";
import { FiAlertCircle, FiClock, FiXCircle, FiCheckCircle } from "react-icons/fi";
import { readTodoTasks } from "../../api/TaskApi";
-import axiosInstance from "../../api/configs/AxiosConfig";
+import axiosInstance from "src/api/AxiosConfig";
function EachBlog({ name, colorCode, contentList, icon }) {
const [tasks, setTasks] = useState(contentList);
- const handleCheckboxChange = async index => {
+ const handleCheckboxChange = async (index) => {
try {
- setTasks(contentList)
+ setTasks(contentList);
const updatedTasks = [...tasks];
const taskId = updatedTasks[index].id;
@@ -60,12 +60,12 @@ function Eisenhower() {
useEffect(() => {
readTodoTasks()
- .then(data => {
+ .then((data) => {
console.log(data);
- const contentList_ui = data.filter(task => task.priority === 1);
- const contentList_uni = data.filter(task => task.priority === 2);
- const contentList_nui = data.filter(task => task.priority === 3);
- const contentList_nuni = data.filter(task => task.priority === 4);
+ const contentList_ui = data.filter((task) => task.priority === 1);
+ const contentList_uni = data.filter((task) => task.priority === 2);
+ const contentList_nui = data.filter((task) => task.priority === 3);
+ const contentList_nuni = data.filter((task) => task.priority === 4);
setTasks({
contentList_ui,
@@ -74,7 +74,7 @@ function Eisenhower() {
contentList_nuni,
});
})
- .catch(error => console.error("Error fetching tasks:", error));
+ .catch((error) => console.error("Error fetching tasks:", error));
}, []);
return (
diff --git a/frontend/src/components/authentication/LoginPage.jsx b/frontend/src/components/authentication/LoginPage.jsx
index 93f8f0b..dff40ab 100644
--- a/frontend/src/components/authentication/LoginPage.jsx
+++ b/frontend/src/components/authentication/LoginPage.jsx
@@ -1,18 +1,17 @@
-import React, { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useEffect, useState } from "react";
+import { useNavigate, redirect } from "react-router-dom";
import { useGoogleLogin } from "@react-oauth/google";
import { useCallback } from "react";
import Particles from "react-tsparticles";
import { loadFull } from "tsparticles";
-import refreshAccessToken from "./refreshAcesstoken";
+import refreshAccessToken from "./refreshAcessToken";
import axiosapi from "../../api/AuthenticationApi";
-import { useAuth } from "../../hooks/authentication/IsAuthenticated";
import { FcGoogle } from "react-icons/fc";
-
+import { useAuth } from "src/hooks/AuthHooks";
function LoginPage() {
+ const { setIsAuthenticated } = useAuth();
const Navigate = useNavigate();
- const { isAuthenticated, setIsAuthenticated } = useAuth();
useEffect(() => {
if (!refreshAccessToken()) {
@@ -43,15 +42,13 @@ function LoginPage() {
// On successful login, store tokens and set the authorization header
localStorage.setItem("access_token", res.data.access);
localStorage.setItem("refresh_token", res.data.refresh);
- axiosapi.axiosInstance.defaults.headers["Authorization"] =
- "Bearer " + res.data.access;
+ axiosapi.axiosInstance.defaults.headers["Authorization"] = "Bearer " + res.data.access;
setIsAuthenticated(true);
- Navigate("/");
+ redirect("/");
})
.catch((err) => {
console.log("Login failed");
console.log(err);
- setIsAuthenticated(false);
});
};
@@ -71,7 +68,6 @@ function LoginPage() {
}
} catch (error) {
console.error("Error with the POST request:", error);
- setIsAuthenticated(false);
}
},
onError: (errorResponse) => console.log(errorResponse),
@@ -89,10 +85,7 @@ function LoginPage() {
}, []);
return (
-
+
{/* Particles Container */}
OR
{/* Login with Google Button */}
-