Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[길수진] week20 #1083

Merged
merged 12 commits into from
May 27, 2024
Merged

[길수진] week20 #1083

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e07640b
16주차 미션
suzinxix May 10, 2024
b4adfa0
chore: tanstack query 설치 및 세팅
suzinxix May 10, 2024
c10719d
chore: zustand, js-cookie 설치
suzinxix May 11, 2024
baf6573
refactor: 회원가입, 로그인 커스텀 훅 수정
suzinxix May 11, 2024
097b2ce
feat: 데이터 fetch 커스텀 훅과 데이터 링크와 폴더 삭제 구현
suzinxix May 12, 2024
1a1ffed
feat: 폴더 추가, 폴더 이름 변경 커스텀 훅 구현
suzinxix May 13, 2024
4750f55
chore: @types/js-cookie 패키지 설치
suzinxix May 13, 2024
603e888
feat: 쿼리키 상수화
suzinxix May 13, 2024
6771c68
feat: api end point 상수화
suzinxix May 13, 2024
e3f5c91
remove: 불필요 파일 삭제
suzinxix May 13, 2024
e2b8034
fix: type 일부 수정
suzinxix May 13, 2024
2f80437
fix: api end point 수정
suzinxix May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions constants/queryKey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const QUERY_KEYS = {
USER: ["user"] as const,
FOLDERS: ["folders"] as const,
LINKS: (folderId?: number | null) =>
folderId ? (["links", folderId] as const) : (["links"] as const),
Comment on lines +2 to +5
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

앞에 key 관리에 대한 리뷰를 달았었는데 key 관리를 잘하고 계셨군요!?!? 👍🏻👍🏻👍🏻👍🏻👍🏻

};
4 changes: 3 additions & 1 deletion hooks/useAddFolder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import instance from "lib/axios";

import { QUERY_KEYS } from "constants/queryKey";

export const useAddFolder = () => {
const queryClient = useQueryClient();

Expand All @@ -10,7 +12,7 @@ export const useAddFolder = () => {
},
onSuccess: () =>
queryClient.invalidateQueries({
queryKey: ["folders"],
queryKey: QUERY_KEYS.FOLDERS,
}),
});
};
4 changes: 3 additions & 1 deletion hooks/useDeleteFolder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import instance from "lib/axios";

import { QUERY_KEYS } from "constants/queryKey";

export const useDeleteFolder = () => {
const deleteFolder = async (folderId: number) => {
try {
Expand All @@ -16,7 +18,7 @@ export const useDeleteFolder = () => {
mutationFn: deleteFolder,
onSuccess: () =>
queryClient.invalidateQueries({
queryKey: ["folders"],
queryKey: QUERY_KEYS.FOLDERS,
}),
});
};
4 changes: 3 additions & 1 deletion hooks/useDeleteLink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import instance from "lib/axios";

import { QUERY_KEYS } from "constants/queryKey";

export const useDeleteLink = (folderId: number) => {
const deleteLink = async (linkId: number) => {
try {
Expand All @@ -16,7 +18,7 @@ export const useDeleteLink = (folderId: number) => {
mutationFn: deleteLink,
onSuccess: () =>
queryClient.invalidateQueries({
queryKey: ["links", folderId],
queryKey: QUERY_KEYS.LINKS(folderId),
}),
});
};
29 changes: 0 additions & 29 deletions hooks/useFetch.ts
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion hooks/useGetFolders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useQuery } from "@tanstack/react-query";
import instance from "lib/axios";

import { QUERY_KEYS } from "constants/queryKey";

export type Folder = {
id: number;
created_at: Date;
Expand All @@ -20,7 +22,7 @@ const fetchFolders = async () => {

export const useGetFolders = () => {
return useQuery({
queryKey: ["folders"],
queryKey: QUERY_KEYS.FOLDERS,
queryFn: fetchFolders,
staleTime: 1000 * 60,
});
Expand Down
4 changes: 3 additions & 1 deletion hooks/useGetLinks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useQuery } from "@tanstack/react-query";
import instance from "lib/axios";

import { QUERY_KEYS } from "constants/queryKey";

export type Link = {
id: number;
favorite: boolean;
Expand All @@ -23,7 +25,7 @@ export const useGetLinks = (folderId: number | null) => {
};

return useQuery({
queryKey: ["links", folderId],
queryKey: QUERY_KEYS.LINKS(folderId),
queryFn: fetchLinks,
staleTime: 1000 * 60,
});
Expand Down
27 changes: 0 additions & 27 deletions hooks/useGetSampleData.ts
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion hooks/useGetUser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useQuery } from "@tanstack/react-query";
import instance from "lib/axios";

import { QUERY_KEYS } from "constants/queryKey";

interface UserResponse {
id: number;
name: string;
Expand All @@ -17,7 +19,7 @@ const fetchUser = async (): Promise<UserResponse> => {

export const useGetUser = () => {
return useQuery({
queryKey: ["user"],
queryKey: QUERY_KEYS.USER,
queryFn: fetchUser,
staleTime: 1000 * 60 * 60,
});
Expand Down
17 changes: 0 additions & 17 deletions hooks/useLocalStorage.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion hooks/useLogin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const useLogin = () => {
return instance.post("/auth/sign-in", data);
},
onSuccess: (res) => {
// 토큰 저장
const { accessToken, refreshToken } = res.data;
setAccessToken(accessToken);
Cookies.set("refreshToken", refreshToken, { expires: 7 });
Expand Down
13 changes: 9 additions & 4 deletions hooks/useUpdateFolder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import instance from "lib/axios";

import { QUERY_KEYS } from "constants/queryKey";

export type Folder = {
id: number;
created_at: Date;
Expand All @@ -14,14 +16,17 @@ export const useUpdateFolder = () => {

return useMutation({
mutationFn: async (data: { folderId: number; name: string }) => {
const response = await instance.put<Folder[]>(`/folders/${data.folderId}`, {
name: data.name,
});
const response = await instance.put<Folder[]>(
`/folders/${data.folderId}`,
{
name: data.name,
}
);
return response.data;
},
onSuccess: () =>
queryClient.invalidateQueries({
queryKey: ["folders"],
queryKey: QUERY_KEYS.FOLDERS,
}),
onError: (error) => {
throw error;
Expand Down