로딩중입니다
;
+ }
+
+ if (error) return {error.message}
;
const handleClickFilterButton = (folderName: string, folderId: number) => {
setIsShowFuncButtonBox(true);
setFolderName(folderName);
@@ -40,20 +52,24 @@ const FolderFilterBox = ({
};
return (
- handleClickShowAllLinksButton()}
- />
+
+ handleClickShowAllLinksButton()}
+ />
+
- {folderData?.data.map(({ name, id }) => {
+ {data.map(({ name, id }) => {
return (
- handleClickFilterButton(name, id)}
- />
+
+ handleClickFilterButton(name, id)}
+ />
+
);
})}
diff --git a/components/folderPage/FolderPageMain/FolderPageMain.tsx b/components/folderPage/FolderPageMain/FolderPageMain.tsx
index ee713701c..77c2247c5 100644
--- a/components/folderPage/FolderPageMain/FolderPageMain.tsx
+++ b/components/folderPage/FolderPageMain/FolderPageMain.tsx
@@ -1,6 +1,6 @@
"use client";
import styles from "./FolderPageMain.module.css";
-import LinkList from "../LinkList/LinkList";
+import LinkListByFolderId from "../LinkListByFolderId/LinkListByFolderId";
import { Dispatch, SetStateAction, useState, useEffect } from "react";
import LinkSearchInput from "@/components/common/LinkSearchInput/LinkSearchInput";
import useModal from "@/hooks/useModal";
@@ -15,6 +15,9 @@ import AddLinkInFolder from "../modal/AddLinkInFolder/AddLinkInFolder";
import ShareFolderModal from "../modal/ShareFolderModal/ShareFolderModal";
import LinkFuncButtonBox from "../LinkFuncButtonBox/LinkFuncButtonBox";
import ShowSearchData from "../ShowSearchData/ShowSearchData";
+import { useQuery } from "@tanstack/react-query";
+import { getAllLinks } from "@/api/folder";
+import { getUserInfo } from "@/api/user";
interface FolderPageMainProps {
isShowAddLinkInFolderModal: boolean;
@@ -31,6 +34,18 @@ const FolderPageMain = ({
sharedUrl,
setSharedUrl,
}: FolderPageMainProps) => {
+ const { data } = useQuery({
+ queryKey: ["links"],
+ queryFn: getAllLinks,
+ });
+
+ const { data: userData } = useQuery({
+ queryKey: ["user"],
+ queryFn: getUserInfo,
+ });
+
+ console.log(data);
+
const [linkData, setLinkData] = useStateLoading...
;
+ if (error) return Error: {error.message}
;
+ console.log(data);
return (
{linkData?.data.length === 0 ? (
+
+ );
};
export default SharedPage;
diff --git a/components/common/Navigation/Navigation.tsx b/components/common/Navigation/Navigation.tsx
index f7e7fcb80..595007992 100644
--- a/components/common/Navigation/Navigation.tsx
+++ b/components/common/Navigation/Navigation.tsx
@@ -3,9 +3,7 @@ import { getUserData } from "@/api/userData";
import NavLoginButton from "../NavLoginButton/NavLoginButton";
import Link from "next/link";
import Image from "next/image";
-const Navigation = async () => {
- const userData = await getUserData();
-
+const Navigation = () => {
return (
diff --git a/components/folderPage/LinkListByFolderId/LinkListByFolderId.tsx b/components/folderPage/LinkListByFolderId/LinkListByFolderId.tsx
index a16721cbd..c069ef345 100644
--- a/components/folderPage/LinkListByFolderId/LinkListByFolderId.tsx
+++ b/components/folderPage/LinkListByFolderId/LinkListByFolderId.tsx
@@ -1,5 +1,5 @@
import styles from "./LinkListByFolderId.module.css";
-import { Dispatch, SetStateAction } from "react";
+import { Dispatch, SetStateAction, useEffect, useState } from "react";
import { LinkDataType } from "@/types/LinkDataTypes";
import FolderPageLinkItem from "../FolderPageLinkItem/FolderPageLinkItem";
import { useQuery } from "@tanstack/react-query";
@@ -11,6 +11,7 @@ interface LinkListProps {
) => void;
setSharedUrl: Dispatch>;
linkData: LinkDataType | null;
+ params: { folderId: string };
}
const LinkListByFolderId = ({
@@ -23,9 +24,12 @@ const LinkListByFolderId = ({
queryKey: ["links"],
queryFn: () => getLinksByFolderId(params.folderId),
});
+ const [paramsId, setParamsId] = useState();
+ console.log(paramsId);
if (isLoading) return
저장된 링크가 없습니다
) : (
- {linkData?.data.map((item) => {
+ {data.map((item) => {
return (
+ ) => void;
+ setSharedUrl: Dispatch>;
+ linkData: LinkDataType | null;
+}
+
+const LinkListByFolderId = ({
+ handleAddLinkInFolderModalClick,
+ setSharedUrl,
+ linkData,
+ params,
+}: LinkListProps) => {
+ const { data, isLoading, error } = useQuery({
+ queryKey: ["links"],
+ queryFn: () => getLinksByFolderId(params.folderId),
+ });
+
+ if (isLoading) return ) => void;
}) => {
+ const queryClient = useQueryClient();
+ const [addFolderName, setAddFolderName] = useState();
+ const addFolderByName = useMutation({
+ mutationFn: addFolder,
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ["folders"] });
+ },
+ });
+ const onChangeFolderNameInput = (e) => {
+ setAddFolderName(e.target.value);
+ };
+ const handleAddModalClick = () => {
+ addFolderByName.mutate(addFolderName, {});
+ handleAddFolderModalClick();
+ };
return (
- 추가하기
+
+ 추가하기
+
);
diff --git a/components/folderPage/modal/ModalButton/ModalButton.tsx b/components/folderPage/modal/ModalButton/ModalButton.tsx
index 5e285200e..5fe76b00b 100644
--- a/components/folderPage/modal/ModalButton/ModalButton.tsx
+++ b/components/folderPage/modal/ModalButton/ModalButton.tsx
@@ -1,5 +1,12 @@
-import styles from './ModalButton.module.css';
-import { childrenProps } from '../ModalWrapper/ModalWrapper';
-export default function ModalButton({ children } : childrenProps) {
- return ;
+import styles from "./ModalButton.module.css";
+import { childrenProps } from "../ModalWrapper/ModalWrapper";
+export default function ModalButton({
+ children,
+ handleAddModalClick,
+}: childrenProps) {
+ return (
+
+ );
}
diff --git a/components/sharedPage/SharePageFolderList/SharePageFolderList.module.css b/components/sharedPage/SharePageFolderList/SharePageLinkList.module.css
similarity index 100%
rename from components/sharedPage/SharePageFolderList/SharePageFolderList.module.css
rename to components/sharedPage/SharePageFolderList/SharePageLinkList.module.css
diff --git a/components/sharedPage/SharePageFolderList/SharePageFolderList.tsx b/components/sharedPage/SharePageFolderList/SharePageLinkList.tsx
similarity index 90%
rename from components/sharedPage/SharePageFolderList/SharePageFolderList.tsx
rename to components/sharedPage/SharePageFolderList/SharePageLinkList.tsx
index a4bdb87db..166c67692 100644
--- a/components/sharedPage/SharePageFolderList/SharePageFolderList.tsx
+++ b/components/sharedPage/SharePageFolderList/SharePageLinkList.tsx
@@ -1,4 +1,3 @@
-import styles from "./SharePageFolderList.module.css";
import { getSharedPageFolderData } from "@/api/sharedPageFolderData";
import SharePageFolderItem from "../SharPageFolderItem/SharePageFolderItem";
diff --git a/components/sharedPage/SharedPageMain/SharedPageMain.tsx b/components/sharedPage/SharedPageMain/SharedPageMain.tsx
index 6b437d3d0..cfecc10d9 100644
--- a/components/sharedPage/SharedPageMain/SharedPageMain.tsx
+++ b/components/sharedPage/SharedPageMain/SharedPageMain.tsx
@@ -1,6 +1,6 @@
import styles from "./SharedPageMain.module.css";
import LinkSearchInput from "@/components/common/LinkSearchInput/LinkSearchInput";
-import SharePageFolderList from "../SharePageFolderList/SharePageFolderList";
+import SharePageFolderList from "../SharePageFolderList/SharePageLinkList";
const SharedPageMain = () => {
return (
diff --git a/components/signInPage/SignInForm/SignInForm.tsx b/components/signInPage/SignInForm/SignInForm.tsx
index 8771233db..1a50775dc 100644
--- a/components/signInPage/SignInForm/SignInForm.tsx
+++ b/components/signInPage/SignInForm/SignInForm.tsx
@@ -52,7 +52,6 @@ const SignInForm = () => {
return;
}
const json = await response.json();
- console.log(json);
const accessToken = json.accessToken;
localStorage.setItem("accessToken", accessToken);
router.push("/folder");
From 757f0251b67efe50028a276d7b34e297df0bb906 Mon Sep 17 00:00:00 2001
From: hoj0806 <90647684+hoj0806@users.noreply.github.com>
Date: Mon, 13 May 2024 18:02:18 +0900
Subject: [PATCH 04/14] =?UTF-8?q?feat=20:=20=ED=8F=B4=EB=8D=94=20=EC=82=AD?=
=?UTF-8?q?=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20=EB=B0=8F?=
=?UTF-8?q?=20=ED=8F=B4=EB=8D=94=20=EC=82=AD=EC=A0=9C=EC=8B=9C=20/folder?=
=?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99,=20=ED=8F=B4=EB=8D=94=20?=
=?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B5=9C?=
=?UTF-8?q?=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/folders.ts | 18 +++++++++++++++
.../FolderPageMain/FolderPageMain.tsx | 1 +
.../modal/DeleteButton/DeleteButton.tsx | 15 +++++++++----
.../DeleteFolderModal/DeleteFolderModal.tsx | 22 +++++++++++++++++--
4 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/api/folders.ts b/api/folders.ts
index c489a6085..43274a06f 100644
--- a/api/folders.ts
+++ b/api/folders.ts
@@ -40,4 +40,22 @@ export const addFolder = async (folderName: string) => {
throw error;
}
};
+
+export const deleteFolder = async (folderId: number) => {
+ const accessToken = localStorage.getItem("accessToken");
+
+ try {
+ const response = await instance.delete(
+ `https://bootcamp-api.codeit.kr/api/linkbrary/v1/folders/${folderId}`,
+ {
+ headers: {
+ Authorization: `Bearer ${accessToken}`,
+ },
+ }
+ );
+ } catch (error) {
+ console.error("error");
+ throw error;
+ }
+};
axios.defaults.withCredentials = true;
diff --git a/components/folderPage/FolderPageMain/FolderPageMain.tsx b/components/folderPage/FolderPageMain/FolderPageMain.tsx
index 77c2247c5..5c5d89bb6 100644
--- a/components/folderPage/FolderPageMain/FolderPageMain.tsx
+++ b/components/folderPage/FolderPageMain/FolderPageMain.tsx
@@ -165,6 +165,7 @@ const FolderPageMain = ({
) => void;
@@ -9,7 +11,21 @@ interface DeleteFolderModalProps {
const DeleteFolderModal = ({
FolderModalValue,
handleDeleteFolderModalClick,
+ folderId,
}: DeleteFolderModalProps) => {
+ const queryClient = useQueryClient();
+ const router = useRouter();
+ const deleteFolderById = useMutation({
+ mutationFn: deleteFolder,
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ["folders"] });
+ router.push("/folder");
+ },
+ });
+ const handleDeleteButton = () => {
+ deleteFolderById.mutate(folderId.slice(10, folderId.length));
+ handleDeleteFolderModalClick();
+ };
return (
삭제하기
+
+ 삭제하기
+
);
From 63e8b7d5cd59881c691cf2bdaf006845d7e2d210 Mon Sep 17 00:00:00 2001
From: hoj0806 <90647684+hoj0806@users.noreply.github.com>
Date: Mon, 13 May 2024 19:56:58 +0900
Subject: [PATCH 05/14] =?UTF-8?q?feat=20:=20=EB=A7=81=ED=81=AC=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80=20=EA=B8=B0=EB=8A=A5=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/links.ts | 23 +++++++++
app/(FolderPage)/folder/[folderId]/page.tsx | 1 +
app/(SharedPage)/shared/[folderId]/page.tsx | 9 +++-
components/common/Navigation/Navigation.tsx | 4 +-
.../FolderFilterBox/FolderFilterBox.tsx | 6 ++-
.../FolderPageMain/FolderPageMain.tsx | 25 +---------
.../AddLinkInFolder.module.css | 8 +++
.../modal/AddLinkInFolder/AddLinkInFolder.tsx | 49 ++++++++++++++++---
.../DeleteFolderModal/DeleteFolderModal.tsx | 1 +
.../modal/ModalButton/ModalButton.tsx | 5 +-
.../SharePageFolderList/SharePageLinkList.tsx | 21 +++++---
.../SharedPageMain/SharedPageMain.tsx | 4 +-
12 files changed, 108 insertions(+), 48 deletions(-)
diff --git a/api/links.ts b/api/links.ts
index fba2f6c36..b172dde9f 100644
--- a/api/links.ts
+++ b/api/links.ts
@@ -21,4 +21,27 @@ export const getLinksByFolderId = async (folderId: string) => {
}
};
+export const addLinkInFolder = async (url: string, folderId: number) => {
+ const accessToken = localStorage.getItem("accessToken");
+
+ try {
+ const response = await instance.post(
+ "https://bootcamp-api.codeit.kr/api/linkbrary/v1/links",
+ {
+ url: url,
+ folderId: folderId,
+ },
+ {
+ headers: {
+ Authorization: `Bearer ${accessToken}`,
+ },
+ }
+ );
+ return response.data;
+ } catch (error) {
+ console.error("error");
+ throw error;
+ }
+};
+
axios.defaults.withCredentials = true;
diff --git a/app/(FolderPage)/folder/[folderId]/page.tsx b/app/(FolderPage)/folder/[folderId]/page.tsx
index b64986bbe..09a14b7ea 100644
--- a/app/(FolderPage)/folder/[folderId]/page.tsx
+++ b/app/(FolderPage)/folder/[folderId]/page.tsx
@@ -12,6 +12,7 @@ import {
HydrationBoundary,
QueryClient,
} from "@tanstack/react-query";
+import AddLinkInFolder from "@/components/folderPage/modal/AddLinkInFolder/AddLinkInFolder";
const FolderPage = () => {
const queryClient = new QueryClient();
useEffect(() => {
diff --git a/app/(SharedPage)/shared/[folderId]/page.tsx b/app/(SharedPage)/shared/[folderId]/page.tsx
index fb1a42a33..630a5e949 100644
--- a/app/(SharedPage)/shared/[folderId]/page.tsx
+++ b/app/(SharedPage)/shared/[folderId]/page.tsx
@@ -6,8 +6,13 @@ export const metadata = {
title: "Shared",
};
-const SharedPage = async ({ params }: { folderId: number }) => {
- return Loading...
;
+ if (error) return Error: {error.message}
;
+ console.log(data);
+ return (
+
+ {linkData?.data.length === 0 ? (
+
+ );
+};
+
+export default LinkListByFolderId;
diff --git a/components/folderPage/modal/AddFolderModal/AddFolderModal.tsx b/components/folderPage/modal/AddFolderModal/AddFolderModal.tsx
index e6fe3c8b7..27a94b79d 100644
--- a/components/folderPage/modal/AddFolderModal/AddFolderModal.tsx
+++ b/components/folderPage/modal/AddFolderModal/AddFolderModal.tsx
@@ -1,18 +1,41 @@
import styles from "./AddFolderModal.module.css";
import ModalButton from "../ModalButton/ModalButton";
import ModalWrapper from "../ModalWrapper/ModalWrapper";
+import { useState } from "react";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { addFolder } from "@/api/folders";
const AddFolderModal = ({
handleAddFolderModalClick,
}: {
handleAddFolderModalClick: (e: React.MouseEvent저장된 링크가 없습니다
+ ) : (
+
+ {data.map((item) => {
+ return (
+
+ )}
+ 폴더 추가
-
+
@@ -23,7 +39,9 @@ const DeleteFolderModal = ({
onClick={handleDeleteFolderModalClick}
/>
- {params.folderId}
;
+const SharedPage = async ({ params }: { folderId: string }) => {
+ return (
+
diff --git a/components/folderPage/FolderFilterBox/FolderFilterBox.tsx b/components/folderPage/FolderFilterBox/FolderFilterBox.tsx
index 2aa2e3f47..b81491368 100644
--- a/components/folderPage/FolderFilterBox/FolderFilterBox.tsx
+++ b/components/folderPage/FolderFilterBox/FolderFilterBox.tsx
@@ -1,4 +1,4 @@
-import { SetStateAction, useState, Dispatch } from "react";
+import { SetStateAction, useState, Dispatch, useEffect } from "react";
import styles from "./FolderFilterBox.module.css";
import FolderFilterButton from "../FolderFilterButton/FolderFilterButton";
import ShowAllLinksButton from "../ShowAllLinkButton/ShowAllLinkButton";
@@ -22,8 +22,9 @@ const FolderFilterBox = ({
setIsShowFuncButtonBox,
setFolderModalValue,
setShareUrlFolderId,
+ params,
}: FolderFilterBoxProps) => {
- const [activeFilterId, setActiveFilterId] = useState("showAll");
+ const [activeFilterId, setActiveFilterId] = useState("");
const { data, isLoading, error } = useQuery({
queryKey: ["folders"],
@@ -35,6 +36,7 @@ const FolderFilterBox = ({
}
if (error) return (null);
- const getLinkData = async () => {
- const response = await fetch(
- `https://bootcamp-api.codeit.kr/api/users/3/links${folderId}`
- );
- const json: LinkDataType = await response.json();
- setLinkData(json);
- };
-
- const getFolderData = async () => {
- const response = await fetch(
- "https://bootcamp-api.codeit.kr/api/users/3/folders"
- );
- const json: FolderDataType = await response.json();
- setFolderData(json);
- };
-
- useEffect(() => {
- getLinkData();
- }, [folderId]);
-
- useEffect(() => {
- getFolderData();
- }, []);
const [folderName, setFolderName] = useState("");
const [isShowFuncButtonBox, setIsShowFuncButtonBox] = useState(false);
diff --git a/components/folderPage/modal/AddLinkInFolder/AddLinkInFolder.module.css b/components/folderPage/modal/AddLinkInFolder/AddLinkInFolder.module.css
index 327aed0e7..8343a2d38 100644
--- a/components/folderPage/modal/AddLinkInFolder/AddLinkInFolder.module.css
+++ b/components/folderPage/modal/AddLinkInFolder/AddLinkInFolder.module.css
@@ -89,6 +89,14 @@
align-items: center;
}
+.list-item-wrapper-active {
+ display: flex;
+ gap: 0.8rem;
+ background: var(--Linkbrary-bg, #f0f6ff);
+ border-radius: 0.8rem;
+ align-items: center;
+}
+
.link-count {
color: #9fa6b2;
font-family: var(--Pretendard-Regular);
diff --git a/components/folderPage/modal/AddLinkInFolder/AddLinkInFolder.tsx b/components/folderPage/modal/AddLinkInFolder/AddLinkInFolder.tsx
index 223269e42..8fc7298f7 100644
--- a/components/folderPage/modal/AddLinkInFolder/AddLinkInFolder.tsx
+++ b/components/folderPage/modal/AddLinkInFolder/AddLinkInFolder.tsx
@@ -2,6 +2,10 @@ import styles from "./AddLinkInFolder.module.css";
import ModalButton from "../ModalButton/ModalButton";
import ModalWrapper from "../ModalWrapper/ModalWrapper";
import { FolderDataType } from "@/types/FolderDataTypes";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { getAllFolders } from "@/api/folders";
+import { useState } from "react";
+import { addLinkInFolder } from "@/api/links";
interface isShowAddLinkInFolderProps {
handleAddLinkInFolderModalClick: (
e: React.MouseEvent
@@ -9,12 +13,33 @@ interface isShowAddLinkInFolderProps {
folderData: FolderDataType | null;
sharedUrl: string;
}
-
const AddLinkInFolder = ({
handleAddLinkInFolderModalClick,
- folderData,
+
sharedUrl,
}: isShowAddLinkInFolderProps) => {
+ const { data } = useQuery({
+ queryKey: ["folders"],
+ queryFn: getAllFolders,
+ });
+ const queryClient = useQueryClient();
+ const [selectFolder, setSelectFolder] = useState("");
+ const [selectFolderId, setSelectFolderId] = useState();
+
+ const addLink = useMutation({
+ mutationFn: ([url, folderId]: [string, number]) =>
+ addLinkInFolder(url, folderId),
+
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ["links"] });
+ },
+ });
+
+ console.log(selectFolderId);
+ const handleAddButton = () => {
+ addLink.mutate([sharedUrl, selectFolderId]);
+ handleAddLinkInFolderModalClick();
+ };
return (
추가하기
+ 추가하기
);
diff --git a/components/folderPage/modal/DeleteFolderModal/DeleteFolderModal.tsx b/components/folderPage/modal/DeleteFolderModal/DeleteFolderModal.tsx
index 3c0b0be96..470f42dbe 100644
--- a/components/folderPage/modal/DeleteFolderModal/DeleteFolderModal.tsx
+++ b/components/folderPage/modal/DeleteFolderModal/DeleteFolderModal.tsx
@@ -15,6 +15,7 @@ const DeleteFolderModal = ({
}: DeleteFolderModalProps) => {
const queryClient = useQueryClient();
const router = useRouter();
+
const deleteFolderById = useMutation({
mutationFn: deleteFolder,
onSuccess: () => {
diff --git a/components/folderPage/modal/ModalButton/ModalButton.tsx b/components/folderPage/modal/ModalButton/ModalButton.tsx
index 5fe76b00b..6ae95f700 100644
--- a/components/folderPage/modal/ModalButton/ModalButton.tsx
+++ b/components/folderPage/modal/ModalButton/ModalButton.tsx
@@ -2,10 +2,11 @@ import styles from "./ModalButton.module.css";
import { childrenProps } from "../ModalWrapper/ModalWrapper";
export default function ModalButton({
children,
- handleAddModalClick,
+
+ handleAddButton,
}: childrenProps) {
return (
- {error.message}
;
+
const handleClickFilterButton = (folderName: string, folderId: number) => {
setIsShowFuncButtonBox(true);
setFolderName(folderName);
diff --git a/components/folderPage/FolderPageMain/FolderPageMain.tsx b/components/folderPage/FolderPageMain/FolderPageMain.tsx
index 5c5d89bb6..ac2c239d0 100644
--- a/components/folderPage/FolderPageMain/FolderPageMain.tsx
+++ b/components/folderPage/FolderPageMain/FolderPageMain.tsx
@@ -1,7 +1,7 @@
"use client";
import styles from "./FolderPageMain.module.css";
import LinkListByFolderId from "../LinkListByFolderId/LinkListByFolderId";
-import { Dispatch, SetStateAction, useState, useEffect } from "react";
+import { Dispatch, SetStateAction, useState } from "react";
import LinkSearchInput from "@/components/common/LinkSearchInput/LinkSearchInput";
import useModal from "@/hooks/useModal";
import { LinkDataType } from "@/types/LinkDataTypes";
@@ -50,29 +50,6 @@ const FolderPageMain = ({
const [folderId, setFolderId] = useState("");
const [folderData, setFolderData] = useState
@@ -29,22 +54,32 @@ const AddLinkInFolder = ({
/>
-
- {folderData?.data.map(({ name, link }, i) => {
+ {data.map(({ name, link_count, id }, i) => {
return (
-
- +
- {
+ setSelectFolderId(id);
+ }}
+ >
{name}
- {link.count === 0 ? ( + {data.count === 0 ? (
링크가 없습니다) : ( -{`${link.count}개 링크`}+{`${link_count}개 링크`})}
);
})}
Loading...
;
if (error) return Error: {error.message}
;
+
console.log(data);
return (
@@ -43,6 +47,7 @@ const LinkListByFolderId = ({
setSharedUrl={setSharedUrl}
date={item.created_at.slice(0, 10)}
key={item.id}
+ linkId={item.id}
/>
);
})}
diff --git a/components/folderPage/modal/DeleteLinkModal/DeleteLinkModal.tsx b/components/folderPage/modal/DeleteLinkModal/DeleteLinkModal.tsx
index 55cb92955..adb8ae691 100644
--- a/components/folderPage/modal/DeleteLinkModal/DeleteLinkModal.tsx
+++ b/components/folderPage/modal/DeleteLinkModal/DeleteLinkModal.tsx
@@ -1,31 +1,51 @@
-import ModalWrapper from '../ModalWrapper/ModalWrapper';
-import DeleteModalButton from '../DeleteButton/DeleteButton';
-import styles from './DeleteLinkModal.module.css';
-
+import ModalWrapper from "../ModalWrapper/ModalWrapper";
+import DeleteModalButton from "../DeleteButton/DeleteButton";
+import styles from "./DeleteLinkModal.module.css";
+import { useMutation } from "@tanstack/react-query";
+import { deleteLink } from "@/api/links";
+import { useQueryClient } from "@tanstack/react-query";
interface DeleteLinkModalProps {
url: string;
handleDeleteLinkModalClick: React.MouseEventHandler;
+ linkId: number;
}
export default function DeleteLinkModal({
handleDeleteLinkModalClick,
url,
+ linkId,
}: DeleteLinkModalProps) {
+ const queryClient = useQueryClient();
+
+ const deleteLinks = useMutation({
+ mutationFn: ([linkId]: [number]) => deleteLink(linkId),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ["links"] });
+ },
+ });
+
+ const handleDeleteButton = () => {
+ deleteLinks.mutate([linkId]);
+ handleDeleteLinkModalClick();
+ };
+
return (
-
- Folder | Linkbrary
diff --git a/app/(SharedPage)/shared/[folderId]/page.tsx b/app/(SharedPage)/shared/[folderId]/page.tsx
index 630a5e949..366333257 100644
--- a/app/(SharedPage)/shared/[folderId]/page.tsx
+++ b/app/(SharedPage)/shared/[folderId]/page.tsx
@@ -1,16 +1,26 @@
import Profile from "@/components/sharedPage/Profile/Profile";
import SharedPageMain from "@/components/sharedPage/SharedPageMain/SharedPageMain";
import HeaderFooterLayout from "@/app/headerFooterLayout";
+import { useQuery } from "@tanstack/react-query";
+import { getFolderById } from "@/api/folders";
+import {
+ dehydrate,
+ HydrationBoundary,
+ QueryClient,
+} from "@tanstack/react-query";
export const metadata = {
title: "Shared",
};
+export const queryClient = new QueryClient();
const SharedPage = async ({ params }: { folderId: string }) => {
return (
-
+
);
};
diff --git a/app/(SharedPage)/shared/page.tsx b/app/(SharedPage)/shared/page.tsx
index 62cb13236..be64243d5 100644
--- a/app/(SharedPage)/shared/page.tsx
+++ b/app/(SharedPage)/shared/page.tsx
@@ -1,18 +1,9 @@
-import Profile from "@/components/sharedPage/Profile/Profile";
-import SharedPageMain from "@/components/sharedPage/SharedPageMain/SharedPageMain";
-import HeaderFooterLayout from "@/app/headerFooterLayout";
-
export const metadata = {
title: "Shared",
};
const SharedPage = async () => {
- return (
-
-
- );
+ return ;
};
export default SharedPage;
diff --git a/components/folderPage/LinkList/LinkList.tsx b/components/folderPage/LinkList/LinkList.tsx
index c2f906838..f60a1dcc3 100644
--- a/components/folderPage/LinkList/LinkList.tsx
+++ b/components/folderPage/LinkList/LinkList.tsx
@@ -17,7 +17,6 @@ const LinkList = ({
setSharedUrl,
linkData,
}: LinkListProps) => {
-
const { data, isLoading, error } = useQuery({
queryKey: ["links"],
queryFn: () => getAllLinks(),
@@ -26,6 +25,7 @@ const LinkList = ({
if (isLoading) return
- => {
try {
const response = await fetch(
- "https://bootcamp-api.codeit.kr/api/check-email",
+ "https://bootcamp-api.codeit.kr/api/linkbrary/v1/users/check-email",
{
method: "POST",
headers: {
From a2eae1b2ca0720da20dc362ce97903905ac274b7 Mon Sep 17 00:00:00 2001
From: hoj0806 <90647684+hoj0806@users.noreply.github.com>
Date: Mon, 13 May 2024 20:53:59 +0900
Subject: [PATCH 08/14] =?UTF-8?q?refactor=20:=20=ED=9A=8C=EC=9B=90?=
=?UTF-8?q?=EA=B0=80=EC=9E=85=20url=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/folderPage/modal/ModalButton/ModalButton.tsx | 4 ++--
components/signupPage/SignupForm.tsx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/folderPage/modal/ModalButton/ModalButton.tsx b/components/folderPage/modal/ModalButton/ModalButton.tsx
index 6ae95f700..067135db6 100644
--- a/components/folderPage/modal/ModalButton/ModalButton.tsx
+++ b/components/folderPage/modal/ModalButton/ModalButton.tsx
@@ -3,10 +3,10 @@ import { childrenProps } from "../ModalWrapper/ModalWrapper";
export default function ModalButton({
children,
- handleAddButton,
+ handleAddModalClick,
}: childrenProps) {
return (
-
);
diff --git a/public/assets/images/favortie_link.svg b/public/assets/images/favortie_link.svg
new file mode 100644
index 000000000..f68490c1d
--- /dev/null
+++ b/public/assets/images/favortie_link.svg
@@ -0,0 +1,10 @@
+
From 155b08d7aee0082c0161e4085ab2756ae4a935c4 Mon Sep 17 00:00:00 2001
From: hoj0806 <90647684+hoj0806@users.noreply.github.com>
Date: Tue, 14 May 2024 00:44:56 +0900
Subject: [PATCH 10/14] =?UTF-8?q?feat=20:=20shared=20=ED=8E=98=EC=9D=B4?=
=?UTF-8?q?=EC=A7=80=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/folders.ts | 19 +++++++
api/user.ts | 2 +-
app/(FolderPage)/folder/[folderId]/page.tsx | 2 +
app/(SharedPage)/shared/[folderId]/page.tsx | 14 +++++-
app/(SharedPage)/shared/page.tsx | 11 +---
components/folderPage/LinkList/LinkList.tsx | 3 +-
.../LinkListByFolderId/LinkListByFolderId.tsx | 27 +++++-----
.../sharedPage/Profile/Profile.module.css | 1 +
components/sharedPage/Profile/Profile.tsx | 50 +++++++++++++------
.../SharePageFolderItem.tsx | 6 +--
.../SharePageFolderList/SharePageLinkList.tsx | 17 ++++---
util/Provider.tsx | 1 -
12 files changed, 103 insertions(+), 50 deletions(-)
diff --git a/api/folders.ts b/api/folders.ts
index d03b8bec2..3d152e54d 100644
--- a/api/folders.ts
+++ b/api/folders.ts
@@ -20,6 +20,25 @@ export const getAllFolders = async () => {
}
};
+export const getFolderById = async (folderId: number) => {
+ const accessToken = localStorage.getItem("accessToken");
+
+ try {
+ const response = await instance.get(
+ `https://bootcamp-api.codeit.kr/api/linkbrary/v1/folders/${folderId}`,
+ {
+ headers: {
+ Authorization: `Bearer ${accessToken}`, // Bearer 토큰 추가
+ },
+ }
+ );
+ return response.data;
+ } catch (error) {
+ console.error("Error");
+ throw error;
+ }
+};
+
export const addFolder = async (folderName: string) => {
const accessToken = localStorage.getItem("accessToken");
try {
diff --git a/api/user.ts b/api/user.ts
index 1bcb93774..69c691f7a 100644
--- a/api/user.ts
+++ b/api/user.ts
@@ -14,7 +14,7 @@ export const getUserInfo = async () => {
},
}
);
- return response;
+ return response.data;
} catch (error) {
console.error("Error fetching links:", error);
throw error;
diff --git a/app/(FolderPage)/folder/[folderId]/page.tsx b/app/(FolderPage)/folder/[folderId]/page.tsx
index 9493d3dfe..b05c2b240 100644
--- a/app/(FolderPage)/folder/[folderId]/page.tsx
+++ b/app/(FolderPage)/folder/[folderId]/page.tsx
@@ -22,6 +22,8 @@ const FolderPage = ({ params }: { folderId: string }) => {
} = useModal(false);
const [sharedUrl, setSharedUrl] = useState("");
+
+ console.log(window.location.href.replaceAll("folder", "shared"));
return (
<>
링크 삭제
- {url}
-
+
+ 삭제하기
+
+ 삭제하기
+
);
From 440117cf92ebde66e625c4dae7a2524daf55ba2e Mon Sep 17 00:00:00 2001
From: hoj0806 <90647684+hoj0806@users.noreply.github.com>
Date: Mon, 13 May 2024 20:48:07 +0900
Subject: [PATCH 07/14] =?UTF-8?q?refactor=20:=20=EC=9D=B4=EB=A9=94?=
=?UTF-8?q?=EC=9D=BC=20=EC=A4=91=EB=B3=B5=20=EC=B2=B4=ED=81=AC=20url=20?=
=?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/signupPage/SignupForm.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/signupPage/SignupForm.tsx b/components/signupPage/SignupForm.tsx
index 23ce0f17b..f04a9765d 100644
--- a/components/signupPage/SignupForm.tsx
+++ b/components/signupPage/SignupForm.tsx
@@ -45,7 +45,7 @@ const SignUpForm = () => {
): Promise
+ 
- 링크 삭제
+ {url}
+ {linkId}
Loading...
;
if (error) return Error: {error.message}
;
console.log(data);
+ console.log("전체 데이터입니다");
return (
{linkData?.data.length === 0 ? (
@@ -42,6 +42,7 @@ const LinkList = ({
setSharedUrl={setSharedUrl}
date={item.created_at.slice(0, 10)}
key={item.id}
+ linkId={item.id}
/>
);
})}
diff --git a/components/folderPage/LinkListByFolderId/LinkListByFolderId.tsx b/components/folderPage/LinkListByFolderId/LinkListByFolderId.tsx
index f90d8fd2b..bcaca8b11 100644
--- a/components/folderPage/LinkListByFolderId/LinkListByFolderId.tsx
+++ b/components/folderPage/LinkListByFolderId/LinkListByFolderId.tsx
@@ -3,8 +3,8 @@ import { Dispatch, SetStateAction, useEffect, useState } from "react";
import { LinkDataType } from "@/types/LinkDataTypes";
import FolderPageLinkItem from "../FolderPageLinkItem/FolderPageLinkItem";
import { useQuery } from "@tanstack/react-query";
-import { getAllLinks } from "@/api/folder";
import { getLinksByFolderId } from "@/api/links";
+
interface LinkListProps {
handleAddLinkInFolderModalClick: (
e: React.MouseEvent
@@ -24,21 +24,25 @@ const LinkListByFolderId = ({
queryKey: ["links"],
queryFn: () => getLinksByFolderId(params.folderId),
});
+ const [linkDatas, setLinkData] = useState();
- const [paramsId, setParamsId] = useState();
+ useEffect(() => {
+ if (data) {
+ setLinkData(data);
+ }
+ }, [data]);
if (isLoading) return
);
diff --git a/components/sharedPage/SharPageFolderItem/SharePageFolderItem.tsx b/components/sharedPage/SharPageFolderItem/SharePageFolderItem.tsx
index 561fffd01..79e4c925c 100644
--- a/components/sharedPage/SharPageFolderItem/SharePageFolderItem.tsx
+++ b/components/sharedPage/SharPageFolderItem/SharePageFolderItem.tsx
@@ -13,16 +13,16 @@ function SharePageFolderItem({
createdAt,
url,
title,
- imageSource,
+ image_source,
date,
}: FolderDataType) {
return (
Loading...
;
if (error) return Error: {error.message}
;
- console.log(data);
return (
- <>
- {data.length === 0 ? (
-
);
};
diff --git a/components/sharedPage/Profile/Profile.module.css b/components/sharedPage/Profile/Profile.module.css
index 668d7121a..bed5de122 100644
--- a/components/sharedPage/Profile/Profile.module.css
+++ b/components/sharedPage/Profile/Profile.module.css
@@ -24,6 +24,7 @@
.profile-name {
font-family: var(--Pretendard-Regular);
line-height: 1.6rem;
+ font-size: 2rem;
}
.folder-name {
diff --git a/components/sharedPage/Profile/Profile.tsx b/components/sharedPage/Profile/Profile.tsx
index d36802b0d..f67f80007 100644
--- a/components/sharedPage/Profile/Profile.tsx
+++ b/components/sharedPage/Profile/Profile.tsx
@@ -1,23 +1,45 @@
+"use client";
+
import styles from "./Profile.module.css";
-import { getSharedPageFolderData } from "@/api/sharedPageFolderData";
+import { useQuery } from "@tanstack/react-query";
+import { getUserInfo } from "@/api/user";
+import { getFolderById } from "@/api/folders";
+const Profile = ({ params }: { folderId: number }) => {
+ const { data } = useQuery({
+ queryKey: ["users"],
+ queryFn: () => getUserInfo(),
+ });
-const Profile = async () => {
- const folderData = await getSharedPageFolderData();
+ const { data: folderData } = useQuery({
+ queryKey: ["folder"],
+ queryFn: () => getFolderById(params.folderId),
+ });
+ console.log(folderData);
+
return (
저장된 링크가 없습니다
- ) : (
-
- {data.map((item) => (
+ {linkDatas && linkDatas.length === 0 ? (
+
+ )}
저장된 링크가 없습니다
+ ) : (
+
+ {linkDatas &&
+ linkDatas.map((item) => (
- )}
-
+
-
- 
-
-
- {folderData?.folder.owner.name}
-
- {folderData?.folder.name}
+ {data?.map((i) => { + return ( +
+ 
+
+ );
+ })}
+
+ {folderData?.map((i) => {
+ return (
+ {i.name}
+ + {i.name} +
+ ); + })}
- {imageSource ? (
+ {image_source ? (
diff --git a/components/sharedPage/SharePageFolderList/SharePageLinkList.tsx b/components/sharedPage/SharePageFolderList/SharePageLinkList.tsx
index 6417c2520..1ecd0544f 100644
--- a/components/sharedPage/SharePageFolderList/SharePageLinkList.tsx
+++ b/components/sharedPage/SharePageFolderList/SharePageLinkList.tsx
@@ -3,24 +3,29 @@
import styles from "./SharePageLinkList.module.css";
import { useQuery } from "@tanstack/react-query";
import { getLinksByFolderId } from "@/api/links";
-const SharePageFolderList = ({ params }) => {
+import { getAllFolders } from "@/api/folders";
+import SharePageFolderItem from "../SharPageFolderItem/SharePageFolderItem";
+const SharePageFolderList = ({ params }: { folderId: string }) => {
console.log(params);
- const { data } = useQuery({
- queryKey: ["shared"],
+ const { data, isLoading, error } = useQuery({
+ queryKey: ["links"],
queryFn: () => getLinksByFolderId(params.folderId),
});
+ if (isLoading) return
Folder | Linkbrary
diff --git a/components/folderPage/FolderPageMain/FolderPageMain.tsx b/components/folderPage/FolderPageMain/FolderPageMain.tsx
index 5b82e16f0..439a615f0 100644
--- a/components/folderPage/FolderPageMain/FolderPageMain.tsx
+++ b/components/folderPage/FolderPageMain/FolderPageMain.tsx
@@ -138,6 +138,7 @@ const FolderPageMain = ({
handleShareFolderModalClick={handleShareFolderModalClick}
FolderModalValue={FolderModalValue}
ShareUrlFolderId={ShareUrlFolderId}
+ folderId={folderId}
/>
)}
{isShowRenameFolderModal && (
diff --git a/components/folderPage/modal/ShareFolderModal/ShareFolderModal.js b/components/folderPage/modal/ShareFolderModal/ShareFolderModal.js
index daf40c753..8c877d480 100644
--- a/components/folderPage/modal/ShareFolderModal/ShareFolderModal.js
+++ b/components/folderPage/modal/ShareFolderModal/ShareFolderModal.js
@@ -6,34 +6,35 @@ const ShareFolderModal = ({
handleShareFolderModalClick,
FolderModalValue,
ShareUrlFolderId,
+ folderId,
}) => {
- const { Kakao } = window;
+ // const { Kakao } = window;
- useEffect(() => {
- Kakao.cleanup();
- Kakao.init("9adbb4d8d436041f3eeadb2a25b525ec");
- });
- const shareKakao = () => {
- Kakao.Share.sendDefault({
- objectType: "feed",
- content: {
- title: "Linkbrary",
- description: "링크를 공유해보세요",
- imageUrl: `${process.env.PUBLIC_URL}/assets/images/share_url_copy_url_icon.svg`,
- link: {
- mobileWebUrl: window.location.host + "/shared/" + ShareUrlFolderId,
- },
- },
- buttons: [
- {
- title: "나도 테스트 하러가기",
- link: {
- mobileWebUrl: window.location.host + "/shared/" + ShareUrlFolderId,
- },
- },
- ],
- });
- };
+ // useEffect(() => {
+ // Kakao.cleanup();
+ // Kakao.init("9adbb4d8d436041f3eeadb2a25b525ec");
+ // });
+ // const shareKakao = () => {
+ // Kakao.Share.sendDefault({
+ // objectType: "feed",
+ // content: {
+ // title: "Linkbrary",
+ // description: "링크를 공유해보세요",
+ // imageUrl: `${process.env.PUBLIC_URL}/assets/images/share_url_copy_url_icon.svg`,
+ // link: {
+ // mobileWebUrl: window.location.host + "/shared/" + ShareUrlFolderId,
+ // },
+ // },
+ // buttons: [
+ // {
+ // title: "나도 테스트 하러가기",
+ // link: {
+ // mobileWebUrl: window.location.host + "/shared/" + ShareUrlFolderId,
+ // },
+ // },
+ // ],
+ // });
+ // };
return (
@@ -48,7 +49,6 @@ const ShareFolderModal = ({
@@ -61,7 +61,7 @@ const ShareFolderModal = ({
"https://twitter.com/intent/tweet?text=" +
window.location.host +
"/shared/" +
- ShareUrlFolderId
+ folderId
);
}}
/>
@@ -74,11 +74,9 @@ const ShareFolderModal = ({
src='assets/images/share_url_copy_url_icon.svg'
onClick={() => {
window.navigator.clipboard
- .writeText(
- window.location.host + "/shared/" + ShareUrlFolderId
- )
+ .writeText(window.location.host + "/shared/" + folderId)
.then(() => {
- alert("링크 복사완료");
+ alert("공유 링크가 복사되었습니다");
});
}}
/>
From 08df53c9067acf42628e64b0cd5fa48b9257e2b0 Mon Sep 17 00:00:00 2001
From: hoj0806 <90647684+hoj0806@users.noreply.github.com>
Date: Tue, 14 May 2024 13:55:18 +0900
Subject: [PATCH 12/14] =?UTF-8?q?=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4?=
=?UTF-8?q?=EC=85=98=20=ED=94=84=EB=A1=9C=ED=95=84=EC=B0=BD=20=EA=B8=B0?=
=?UTF-8?q?=EB=8A=A5=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Navigation/Navigation.tsx | 44 ++++++++++++-------
.../FolderPageMain/FolderPageMain.tsx | 1 -
components/folderPage/LinkList/LinkList.tsx | 3 +-
3 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/components/common/Navigation/Navigation.tsx b/components/common/Navigation/Navigation.tsx
index 595007992..092fbd8fd 100644
--- a/components/common/Navigation/Navigation.tsx
+++ b/components/common/Navigation/Navigation.tsx
@@ -1,9 +1,19 @@
import styles from "./Navigation.module.css";
-import { getUserData } from "@/api/userData";
+
import NavLoginButton from "../NavLoginButton/NavLoginButton";
import Link from "next/link";
import Image from "next/image";
+import { useQuery } from "@tanstack/react-query";
+import { getUserInfo } from "@/api/user";
const Navigation = () => {
+ const { data } = useQuery({
+ queryKey: ["users"],
+ queryFn: () => getUserInfo(),
+ });
+
+
+ const accessToken = localStorage.getItem("accessToken");
+
return (
diff --git a/components/folderPage/FolderPageMain/FolderPageMain.tsx b/components/folderPage/FolderPageMain/FolderPageMain.tsx
index 439a615f0..cd7831940 100644
--- a/components/folderPage/FolderPageMain/FolderPageMain.tsx
+++ b/components/folderPage/FolderPageMain/FolderPageMain.tsx
@@ -45,7 +45,6 @@ const FolderPageMain = ({
params !== undefined ? setFolderId(params.folderId) : setFolderId("전체");
}, []);
- console.log(folderId);
const [linkData, setLinkData] = useState(null);
const [folderData, setFolderData] = useState(null);
diff --git a/components/folderPage/LinkList/LinkList.tsx b/components/folderPage/LinkList/LinkList.tsx
index f60a1dcc3..4ddda4373 100644
--- a/components/folderPage/LinkList/LinkList.tsx
+++ b/components/folderPage/LinkList/LinkList.tsx
@@ -24,8 +24,7 @@ const LinkList = ({
if (isLoading) return
Loading...
;
+ if (error) return Error: {error.message}
;
+
console.log(data);
return (
- {/* {folderData?.folder.links.map((data) => (
+ {data.map((data) => (
);
};
diff --git a/util/Provider.tsx b/util/Provider.tsx
index f02092d82..338889226 100644
--- a/util/Provider.tsx
+++ b/util/Provider.tsx
@@ -7,7 +7,6 @@ import { useState } from "react";
export default function Provider({ children }: { children: ReactNode }) {
const [queryClient] = useState(() => new QueryClient());
-
return (
카카오톡
@@ -17,22 +27,26 @@ const Navigation = () => {
/>
-
- 
- 
+
{userData.email}
+ {data?.map((item) => { + return ( + <> +{item?.email}
+ + ); + })} - )} */} + ) : ( + +Loading...
;
if (error) return Error: {error.message}
;
- console.log(data);
- console.log("전체 데이터입니다");
+
return (
{linkData?.data.length === 0 ? (
From dc54ac2df0d0b80840c0d9d860cad5418ac1757b Mon Sep 17 00:00:00 2001
From: hoj0806 <90647684+hoj0806@users.noreply.github.com>
Date: Tue, 14 May 2024 15:10:35 +0900
Subject: [PATCH 13/14] =?UTF-8?q?fix=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
=?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Navigation/Navigation.tsx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/common/Navigation/Navigation.tsx b/components/common/Navigation/Navigation.tsx
index 092fbd8fd..7579aa869 100644
--- a/components/common/Navigation/Navigation.tsx
+++ b/components/common/Navigation/Navigation.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import styles from "./Navigation.module.css";
import NavLoginButton from "../NavLoginButton/NavLoginButton";
@@ -11,9 +13,8 @@ const Navigation = () => {
queryFn: () => getUserInfo(),
});
-
const accessToken = localStorage.getItem("accessToken");
-
+
return (
From 5e88df8dd8235d84355a20b0cdcbba184b66600e Mon Sep 17 00:00:00 2001
From: hoj0806 <90647684+hoj0806@users.noreply.github.com>
Date: Tue, 14 May 2024 15:41:16 +0900
Subject: [PATCH 14/14] =?UTF-8?q?Fix=20:=EB=84=A4=EB=B9=84=EA=B2=8C?=
=?UTF-8?q?=EC=9D=B4=EC=85=98=20=EB=8F=99=EC=9E=91=EC=98=A4=EB=A5=98=20?=
=?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Navigation/Navigation.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/common/Navigation/Navigation.tsx b/components/common/Navigation/Navigation.tsx
index 7579aa869..7972d5d31 100644
--- a/components/common/Navigation/Navigation.tsx
+++ b/components/common/Navigation/Navigation.tsx
@@ -28,7 +28,7 @@ const Navigation = () => {
/>
- {accessToken !== undefined ? (
+ {accessToken !== null ? (
<>
{data?.map((item) => {
return (