) => {
- setRemember(e.target.checked);
- };
+ setRemember(e.target.checked)
+ }
const handleSubmit = () => {
login({
email,
password,
rememberMe: remember,
- });
- };
+ })
+ }
return (
@@ -63,7 +63,7 @@ const Login: NextPage = () => {
- );
-};
+ )
+}
-export default Login;
+export default Login
diff --git a/src/pages/sign-up.tsx b/src/pages/sign-up.tsx
index 85fb9aa..6cfee57 100644
--- a/src/pages/sign-up.tsx
+++ b/src/pages/sign-up.tsx
@@ -1,21 +1,21 @@
-import type { FormEvent } from "react";
-import React from "react";
+import type { FormEvent } from "react"
+import React from "react"
-import type { NextPage } from "next";
+import type { NextPage } from "next"
-import { Button, Input } from "@/components";
-import { useSignUpMutation } from "@/services";
+import { Button, Input } from "@/components"
+import { useSignUpMutation } from "@/services"
const Login: NextPage = () => {
- const { mutate: signUp } = useSignUpMutation();
+ const { mutate: signUp } = useSignUpMutation()
const handleSubmit = (e: FormEvent) => {
- e.preventDefault();
- const formData = new FormData(e.currentTarget);
+ e.preventDefault()
+ const formData = new FormData(e.currentTarget)
- const values = Object.fromEntries(formData) as any;
- signUp(values);
- };
+ const values = Object.fromEntries(formData) as any
+ signUp(values)
+ }
return (
@@ -43,7 +43,7 @@ const Login: NextPage = () => {
- );
-};
+ )
+}
-export default Login;
+export default Login
diff --git a/src/services/index.ts b/src/services/index.ts
index 8847ade..55f5072 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -1,2 +1,2 @@
-export * from "./todolist-api/auth";
-export * from "./todolist-api/todolists";
+export * from "./todolist-api/auth"
+export * from "./todolist-api/todolists"
diff --git a/src/services/todolist-api/auth/auth.api.ts b/src/services/todolist-api/auth/auth.api.ts
index 7c707f3..b87c4f6 100644
--- a/src/services/todolist-api/auth/auth.api.ts
+++ b/src/services/todolist-api/auth/auth.api.ts
@@ -4,37 +4,37 @@ import type {
MeResponse,
PostLoginArgs,
PostSignUpArgs,
-} from "../todolists";
+} from "../todolists"
-import { handleError } from "@/helpers";
-import { todolistApiInstance } from "@/services/todolist-api/todolist-api.instance";
+import { handleError } from "@/helpers"
+import { todolistApiInstance } from "@/services/todolist-api/todolist-api.instance"
export const AuthApi = {
async login(args: PostLoginArgs) {
const res = await todolistApiInstance.post(
"/auth/login",
args,
- );
+ )
- localStorage.setItem("accessToken", res.data.accessToken);
- localStorage.setItem("refreshToken", res.data.refreshToken);
+ localStorage.setItem("accessToken", res.data.accessToken)
+ localStorage.setItem("refreshToken", res.data.refreshToken)
- return res.data;
+ return res.data
},
async signUp(args: PostSignUpArgs) {
- const res = await todolistApiInstance.post("/auth/sign-up", args);
+ const res = await todolistApiInstance.post("/auth/sign-up", args)
- return res.data;
+ return res.data
},
async logout() {
- const res = await todolistApiInstance.delete("/auth/login");
+ const res = await todolistApiInstance.delete("/auth/login")
- return handleError(res.data);
+ return handleError(res.data)
},
async me() {
- const res = await todolistApiInstance.get("/auth/me");
+ const res = await todolistApiInstance.get("/auth/me")
- return handleError(res.data);
+ return handleError(res.data)
},
-};
+}
diff --git a/src/services/todolist-api/auth/auth.hooks.ts b/src/services/todolist-api/auth/auth.hooks.ts
index cab23ad..96abb81 100644
--- a/src/services/todolist-api/auth/auth.hooks.ts
+++ b/src/services/todolist-api/auth/auth.hooks.ts
@@ -1,46 +1,46 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { useRouter } from "next/router";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
+import { useRouter } from "next/router"
-import { QUERY_KEYS, ROUTES } from "@/constants";
-import { noRefetch } from "@/helpers";
-import { AuthApi } from "@/services/todolist-api/auth/auth.api";
+import { QUERY_KEYS, ROUTES } from "@/constants"
+import { noRefetch } from "@/helpers"
+import { AuthApi } from "@/services/todolist-api/auth/auth.api"
export const useMeQuery = () => {
return useQuery({
queryFn: AuthApi.me,
queryKey: [QUERY_KEYS.ME],
...noRefetch,
- });
-};
+ })
+}
export const useLoginMutation = () => {
- const router = useRouter();
- const queryClient = useQueryClient();
+ const router = useRouter()
+ const queryClient = useQueryClient()
return useMutation({
mutationFn: AuthApi.login,
onSuccess: async () => {
- await queryClient.invalidateQueries([QUERY_KEYS.ME]);
- await router.push(ROUTES.HOME);
+ await queryClient.invalidateQueries([QUERY_KEYS.ME])
+ await router.push(ROUTES.HOME)
},
- });
-};
+ })
+}
export const useLogoutMutation = () => {
- const queryClient = useQueryClient();
- const router = useRouter();
+ const queryClient = useQueryClient()
+ const router = useRouter()
return useMutation({
mutationFn: AuthApi.logout,
onSuccess: async () => {
- await queryClient.invalidateQueries([QUERY_KEYS.ME]);
- await router.push(ROUTES.LOGIN);
+ await queryClient.invalidateQueries([QUERY_KEYS.ME])
+ await router.push(ROUTES.LOGIN)
},
- });
-};
+ })
+}
export const useSignUpMutation = () => {
return useMutation({
mutationFn: AuthApi.signUp,
- });
-};
+ })
+}
diff --git a/src/services/todolist-api/auth/index.ts b/src/services/todolist-api/auth/index.ts
index f13aaf0..f8be71d 100644
--- a/src/services/todolist-api/auth/index.ts
+++ b/src/services/todolist-api/auth/index.ts
@@ -1,2 +1,2 @@
-export * from "./auth.api";
-export * from "./auth.hooks";
+export * from "./auth.api"
+export * from "./auth.hooks"
diff --git a/src/services/todolist-api/todolist-api.instance.ts b/src/services/todolist-api/todolist-api.instance.ts
index 2d701ff..bfa4615 100644
--- a/src/services/todolist-api/todolist-api.instance.ts
+++ b/src/services/todolist-api/todolist-api.instance.ts
@@ -1,19 +1,19 @@
-import { Mutex } from "async-mutex";
-import axios from "axios";
-import router from "next/router";
+import { Mutex } from "async-mutex"
+import axios from "axios"
+import router from "next/router"
-const mutex = new Mutex();
+const mutex = new Mutex()
-let refreshedAt: number | null = null;
+let refreshedAt: number | null = null
export const todolistApiInstance = axios.create({
baseURL: "http://localhost:3000",
-});
+})
async function refreshAccessToken(): Promise {
const res = await todolistApiInstance.post<{
- refreshToken: string;
- accessToken: string;
+ refreshToken: string
+ accessToken: string
}>(
"/auth/refresh-token",
{},
@@ -22,76 +22,76 @@ async function refreshAccessToken(): Promise {
Authorization: `Bearer ${localStorage.getItem("refreshToken")}`,
},
},
- );
+ )
- localStorage.setItem("accessToken", res.data.accessToken);
- localStorage.setItem("refreshToken", res.data.refreshToken);
+ localStorage.setItem("accessToken", res.data.accessToken)
+ localStorage.setItem("refreshToken", res.data.refreshToken)
- return res.data.accessToken;
+ return res.data.accessToken
}
todolistApiInstance.interceptors.request.use(
async (config) => {
if (!config?.url?.includes("refresh-token")) {
- await mutex.waitForUnlock();
+ await mutex.waitForUnlock()
}
config.headers.Authorization =
config.headers.Authorization ??
- `Bearer ${localStorage.getItem("accessToken")}`;
+ `Bearer ${localStorage.getItem("accessToken")}`
- return config;
+ return config
},
(error) => Promise.reject(error),
-);
+)
todolistApiInstance.interceptors.response.use(
(response) => response,
async (error) => {
if (error?.response?.request?.responseURL?.includes("refresh-token")) {
- return;
+ return
}
- await mutex.waitForUnlock();
- const originalRequest = error.config;
+ await mutex.waitForUnlock()
+ const originalRequest = error.config
// Check for a 401 response and if this request hasn't been retried yet
if (error.response?.status === 401 && !originalRequest._retry) {
if (!mutex.isLocked()) {
- originalRequest._retry = true;
+ originalRequest._retry = true
// Use a mutex to ensure that token refresh logic is not run multiple times in parallel
- const release = await mutex.acquire();
+ const release = await mutex.acquire()
if (refreshedAt && refreshedAt + 60000 > new Date().getTime()) {
// If the token has been refreshed within the last minute, use the refreshed token
- originalRequest.headers.Authorization = `Bearer ${localStorage.getItem("accessToken")}`;
- release();
+ originalRequest.headers.Authorization = `Bearer ${localStorage.getItem("accessToken")}`
+ release()
- return todolistApiInstance(originalRequest);
+ return todolistApiInstance(originalRequest)
}
- refreshedAt = new Date().getTime();
+ refreshedAt = new Date().getTime()
try {
- const newAccessToken = await refreshAccessToken();
+ const newAccessToken = await refreshAccessToken()
- originalRequest.headers.Authorization = `Bearer ${newAccessToken}`;
+ originalRequest.headers.Authorization = `Bearer ${newAccessToken}`
- return todolistApiInstance(originalRequest); // Retry the original request with the new token
+ return todolistApiInstance(originalRequest) // Retry the original request with the new token
} catch (error) {
- console.log(window.location.pathname);
+ console.log(window.location.pathname)
if (!["/login", "/sign-up"].includes(window.location.pathname)) {
- router.push("/login");
+ router.push("/login")
}
} finally {
- release();
+ release()
}
} else {
- await mutex.waitForUnlock();
- const newAccessToken = localStorage.getItem("accessToken");
+ await mutex.waitForUnlock()
+ const newAccessToken = localStorage.getItem("accessToken")
- originalRequest.headers.Authorization = `Bearer ${newAccessToken}`;
+ originalRequest.headers.Authorization = `Bearer ${newAccessToken}`
- return todolistApiInstance(originalRequest); // Retry the original request with the new token
+ return todolistApiInstance(originalRequest) // Retry the original request with the new token
}
}
- return Promise.reject(error);
+ return Promise.reject(error)
},
-);
+)
diff --git a/src/services/todolist-api/todolists/index.ts b/src/services/todolist-api/todolists/index.ts
index 4ee7e85..982e747 100644
--- a/src/services/todolist-api/todolists/index.ts
+++ b/src/services/todolist-api/todolists/index.ts
@@ -1,3 +1,3 @@
-export * from "./todolists.hooks";
-export * from "./todolists.api";
-export * from "./todolists.types";
+export * from "./todolists.hooks"
+export * from "./todolists.api"
+export * from "./todolists.types"
diff --git a/src/services/todolist-api/todolists/todolists.api.ts b/src/services/todolist-api/todolists/todolists.api.ts
index 70e630a..2010988 100644
--- a/src/services/todolist-api/todolists/todolists.api.ts
+++ b/src/services/todolist-api/todolists/todolists.api.ts
@@ -1,4 +1,4 @@
-import { handleError } from "@/helpers";
+import { handleError } from "@/helpers"
import type {
CreateTaskResponse,
CreateTodolistResponse,
@@ -8,14 +8,14 @@ import type {
TasksResponse,
Todolist,
UpdateTaskResponse,
-} from "@/services";
-import { todolistApiInstance } from "@/services/todolist-api/todolist-api.instance";
+} from "@/services"
+import { todolistApiInstance } from "@/services/todolist-api/todolist-api.instance"
export const TodolistAPI = {
async getTodolists() {
- const res = await todolistApiInstance.get("/todolists");
+ const res = await todolistApiInstance.get("/todolists")
- return res.data;
+ return res.data
},
async createTodolist({ title }: { title: string }) {
@@ -23,64 +23,64 @@ export const TodolistAPI = {
"/todolists",
{
title,
- }
- );
+ },
+ )
- return handleError(res.data);
+ return handleError(res.data)
},
async deleteTodolist({ todolistId }: { todolistId: string }) {
const res = await todolistApiInstance.delete(
- `/todolists/${todolistId}`
- );
+ `/todolists/${todolistId}`,
+ )
- return res.data;
+ return res.data
},
async getTodolistTasks({ todolistId }: { todolistId: string }) {
const res = await todolistApiInstance.get(
- `/todolists/${todolistId}/tasks`
- );
+ `/todolists/${todolistId}/tasks`,
+ )
- return res.data;
+ return res.data
},
async createTask({
todolistId,
title,
}: {
- todolistId: string;
- title: string;
+ todolistId: string
+ title: string
}) {
const res = await todolistApiInstance.post(
`/todolists/${todolistId}/tasks`,
- { title }
- );
+ { title },
+ )
- return res.data;
+ return res.data
},
async updateTask({ todolistId, task }: { todolistId: string; task: Task }) {
- const { id, ...rest } = task;
+ const { id, ...rest } = task
const res = await todolistApiInstance.patch(
`/todolists/${todolistId}/tasks/${id}`,
- rest
- );
+ rest,
+ )
- return res.data;
+ return res.data
},
async deleteTask({
todolistId,
taskId,
}: {
- todolistId: string;
- taskId: string;
+ todolistId: string
+ taskId: string
}) {
const res = await todolistApiInstance.delete(
- `/todolists/${todolistId}/tasks/${taskId}`
- );
+ `/todolists/${todolistId}/tasks/${taskId}`,
+ )
- return res.data;
+ return res.data
},
-};
+}
diff --git a/src/services/todolist-api/todolists/todolists.hooks.ts b/src/services/todolist-api/todolists/todolists.hooks.ts
index ef77559..91637cc 100644
--- a/src/services/todolist-api/todolists/todolists.hooks.ts
+++ b/src/services/todolist-api/todolists/todolists.hooks.ts
@@ -1,80 +1,80 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
-import { QUERY_KEYS } from "@/constants";
-import { noRefetch } from "@/helpers";
-import { TodolistAPI } from "@/services";
+import { QUERY_KEYS } from "@/constants"
+import { noRefetch } from "@/helpers"
+import { TodolistAPI } from "@/services"
export const useTodolistsQuery = () => {
return useQuery({
queryFn: TodolistAPI.getTodolists,
queryKey: [QUERY_KEYS.TODOLISTS],
...noRefetch,
- });
-};
+ })
+}
export const useCreateTodolistMutation = () => {
- const queryClient = useQueryClient();
+ const queryClient = useQueryClient()
return useMutation({
mutationFn: TodolistAPI.createTodolist,
//todo: add onMutate
onSuccess: async () => {
- await queryClient.invalidateQueries([QUERY_KEYS.TODOLISTS]);
+ await queryClient.invalidateQueries([QUERY_KEYS.TODOLISTS])
},
- });
-};
+ })
+}
export const useDeleteTodolistMutation = () => {
- const queryClient = useQueryClient();
+ const queryClient = useQueryClient()
return useMutation({
mutationFn: TodolistAPI.deleteTodolist,
onSuccess: () => {
- queryClient.invalidateQueries([QUERY_KEYS.TODOLISTS]);
+ queryClient.invalidateQueries([QUERY_KEYS.TODOLISTS])
},
- });
-};
+ })
+}
export const useGetTasksQuery = (todolistId: string) => {
return useQuery({
queryKey: [QUERY_KEYS.TASKS, todolistId],
queryFn: () => TodolistAPI.getTodolistTasks({ todolistId }),
- });
-};
+ })
+}
export const useCreateTaskMutation = () => {
- const queryClient = useQueryClient();
+ const queryClient = useQueryClient()
return useMutation({
mutationFn: TodolistAPI.createTask,
onSuccess: (res) => {
- const todolistId = res.todoListId;
+ const todolistId = res.todoListId
- queryClient.invalidateQueries([QUERY_KEYS.TASKS, todolistId]);
+ queryClient.invalidateQueries([QUERY_KEYS.TASKS, todolistId])
},
- });
-};
+ })
+}
export const useUpdateTaskMutation = () => {
- const queryClient = useQueryClient();
+ const queryClient = useQueryClient()
return useMutation({
mutationFn: TodolistAPI.updateTask,
onSuccess: async (_, { todolistId }) => {
- await queryClient.invalidateQueries([QUERY_KEYS.TASKS, todolistId]);
+ await queryClient.invalidateQueries([QUERY_KEYS.TASKS, todolistId])
},
- });
-};
+ })
+}
export const useDeleteTaskMutation = () => {
- const queryClient = useQueryClient();
+ const queryClient = useQueryClient()
return useMutation({
mutationFn: TodolistAPI.deleteTask,
onSuccess: (_, variables) => {
- const todolistId = variables.todolistId;
+ const todolistId = variables.todolistId
- queryClient.invalidateQueries([QUERY_KEYS.TASKS, todolistId]);
+ queryClient.invalidateQueries([QUERY_KEYS.TASKS, todolistId])
},
- });
-};
+ })
+}
diff --git a/src/services/todolist-api/todolists/todolists.types.ts b/src/services/todolist-api/todolists/todolists.types.ts
index 521d264..d7f3162 100644
--- a/src/services/todolist-api/todolists/todolists.types.ts
+++ b/src/services/todolist-api/todolists/todolists.types.ts
@@ -1,64 +1,64 @@
-import type { ApiResponse } from "@/helpers";
+import type { ApiResponse } from "@/helpers"
-export type TasksResponse = Task[];
+export type TasksResponse = Task[]
export type Task = {
- order: string;
- title: string;
- description?: string | null;
- deadline?: string | null;
- status: TaskStatus;
- priority: TaskPriority;
- ownerId: string;
- todoListId: string;
- id: string;
- createdAt: string;
- updatedAt: string;
-};
+ order: string
+ title: string
+ description?: string | null
+ deadline?: string | null
+ status: TaskStatus
+ priority: TaskPriority
+ ownerId: string
+ todoListId: string
+ id: string
+ createdAt: string
+ updatedAt: string
+}
export type Todolist = {
- id: string;
- title: string;
- addedDate: Date;
- order: number;
-};
+ id: string
+ title: string
+ addedDate: Date
+ order: number
+}
export type PostLoginArgs = {
- email: string;
- password: string;
- rememberMe: boolean;
-};
+ email: string
+ password: string
+ rememberMe: boolean
+}
export type PostSignUpArgs = {
- email: string;
- password: string;
- username?: string;
-};
+ email: string
+ password: string
+ username?: string
+}
export type LoginResponseData = {
- accessToken: string;
- refreshToken: string;
-};
+ accessToken: string
+ refreshToken: string
+}
export type MeResponseData = {
- id: number;
- login: string;
- email: string;
-};
+ id: number
+ login: string
+ email: string
+}
-export type LoginResponse = LoginResponseData;
-export type LogoutResponse = ApiResponse;
-export type MeResponse = ApiResponse;
+export type LoginResponse = LoginResponseData
+export type LogoutResponse = ApiResponse
+export type MeResponse = ApiResponse
-export type DeleteTodolistResponse = ApiResponse;
-export type CreateTodolistResponse = ApiResponse;
+export type DeleteTodolistResponse = ApiResponse
+export type CreateTodolistResponse = ApiResponse
export type CreateTodolistResponseData = {
- item: Todolist;
-};
+ item: Todolist
+}
-export type CreateTaskResponse = Task;
-export type DeleteTaskResponse = undefined;
-export type UpdateTaskResponse = undefined;
+export type CreateTaskResponse = Task
+export type DeleteTaskResponse = undefined
+export type UpdateTaskResponse = undefined
export enum TaskStatus {
OPEN = "OPEN",