diff --git a/package-lock.json b/package-lock.json
index f8c5b11..98bd0ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1967,9 +1967,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001629",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz",
- "integrity": "sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw==",
+ "version": "1.0.30001692",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz",
+ "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==",
"funding": [
{
"type": "opencollective",
diff --git a/src/app/(home)/_components/ContentSlider/ContentSlider.tsx b/src/app/(home)/_components/ContentSlider/ContentSlider.tsx
index f0cd5d9..d63f765 100644
--- a/src/app/(home)/_components/ContentSlider/ContentSlider.tsx
+++ b/src/app/(home)/_components/ContentSlider/ContentSlider.tsx
@@ -6,8 +6,12 @@ import "swiper/css";
import IndexIndicator from "../IndexIndicator/IndexIndicator";
import Image from "next/image";
import { Categories } from "@/app/_utils/Categories";
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { BASE_URL, getShuffledContents } from "@/app/_utils/api";
+import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
+import {
+ BASE_URL,
+ getContentsCount,
+ getShuffledContents,
+} from "@/app/_utils/api";
import { useEffect } from "react";
import { Mousewheel } from "swiper/modules";
import useParams from "@/app/_hooks/useParams";
@@ -18,16 +22,15 @@ import BackImage from "../BackImage/BackImage";
import { useSearchParams } from "next/navigation";
import ContentFallBack from "../ContentSliderFallback/ContentSliderFallback";
-export default function ContentSlider({
- // initialData,
- contentsCountData,
-}: {
- // initialData: { pages: { content: IContentData[] }[]; pageParams: number[] };
- contentsCountData: { count: number };
-}) {
+export default function ContentSlider() {
const searchParams = useParams("categories").getParamsToString();
const initialId = useSearchParams().get("id");
+ const { data: contentsCountData } = useQuery({
+ queryKey: ["contentsCountData", searchParams],
+ queryFn: () => getContentsCount(searchParams),
+ });
+
const {
data: shuffledContentsData,
fetchNextPage,
@@ -37,12 +40,13 @@ export default function ContentSlider({
queryKey: ["shuffledContents", searchParams],
queryFn: ({ pageParam }) =>
getShuffledContents(pageParam, searchParams, initialId),
- initialPageParam: getRandomNumber([], contentsCountData),
+ initialPageParam: getRandomNumber([], contentsCountData || 1),
getNextPageParam: (_, __, ___, allPageParams) => {
return getRandomNumber(allPageParams, contentsCountData);
},
staleTime: 5 * 1000 * 60,
gcTime: 30 * 1000 * 60,
+ enabled: !!contentsCountData,
});
// 데이터 추가 요청
diff --git a/src/app/(home)/_components/Home/Home.tsx b/src/app/(home)/_components/Home/Home.tsx
index e08b1ce..f3b6fc6 100644
--- a/src/app/(home)/_components/Home/Home.tsx
+++ b/src/app/(home)/_components/Home/Home.tsx
@@ -17,9 +17,9 @@ export default async function Home({
return categories.map((category) => `categories=${category}`).join("&");
}
};
- const contentsCountData = await getContentsCount(
- arrayToQueryString(searchParams.categories)
- );
+ // const contentsCountData = await getContentsCount(
+ // arrayToQueryString(searchParams.categories)
+ // );
// const randomIndex = getRandomNumber([], contentsCountData);
// const initialContents = await getShuffledContents(
// randomIndex,
@@ -35,7 +35,9 @@ export default async function Home({
diff --git a/src/app/(home)/page.tsx b/src/app/(home)/page.tsx
index 98c75e8..8f8bcf9 100644
--- a/src/app/(home)/page.tsx
+++ b/src/app/(home)/page.tsx
@@ -37,7 +37,6 @@ export default async function Page({
if (code) {
const gitTokenData = await getGitHubToken(code);
tokenData = await login(gitTokenData?.access_token);
- console.log("tokenData: ", tokenData);
}
return (
diff --git a/src/app/_components/SaveContentModal/SaveContentModal.tsx b/src/app/_components/SaveContentModal/SaveContentModal.tsx
index cedf7c1..95465b3 100644
--- a/src/app/_components/SaveContentModal/SaveContentModal.tsx
+++ b/src/app/_components/SaveContentModal/SaveContentModal.tsx
@@ -71,7 +71,6 @@ const SaveContent = ({
}
}
});
- console.log(isSaved);
closeSaveModal(isSaved);
};
diff --git a/src/app/_hooks/useParams.tsx b/src/app/_hooks/useParams.tsx
index 133b1d0..95703c9 100644
--- a/src/app/_hooks/useParams.tsx
+++ b/src/app/_hooks/useParams.tsx
@@ -6,7 +6,7 @@ const useParams = (queryParam: string) => {
const searchParamsArray = useSearchParams().getAll(queryParam);
// 배열의 각 요소를 '${categories}=값' 형태로 매핑하고, 결과를 '&'로 연결
- const arrayToQueryString = (categories: string[] | null) => {
+ const arrayToQueryString = (categories: string[] | null): string => {
if (categories == null) {
throw new Error("queryParam is null");
} else {
@@ -17,7 +17,7 @@ const useParams = (queryParam: string) => {
};
// 특정 서치 파라미터 문자열을 반환
- const getParamsToString = () => {
+ const getParamsToString = (): string => {
return arrayToQueryString(searchParamsArray);
};
diff --git a/src/app/_utils/CheckLocalStorage.tsx b/src/app/_utils/CheckLocalStorage.tsx
index c80f881..cdc6fdf 100644
--- a/src/app/_utils/CheckLocalStorage.tsx
+++ b/src/app/_utils/CheckLocalStorage.tsx
@@ -14,7 +14,6 @@ export default function CheckLocalStorage({
// 새로운 토큰이 있을 때
if (tokenData !== null) {
localStorage.setItem("tokenData", JSON.stringify(tokenData));
- console.log(tokenData);
return true;
} else {
const localTokenData = localStorage.getItem("tokenData");
@@ -41,21 +40,11 @@ export default function CheckLocalStorage({
) {
const tokenData = await refresh(parsedTokenData.refreshToken);
if (tokenData) {
- console.log(tokenData);
localStorage.setItem("tokenData", JSON.stringify(tokenData));
return true;
}
}
// 모두 유효기간 지났을 때
- else if (
- accessTokenExpiresAt < localTime &&
- refreshTokenExpiresAt < localTime
- ) {
- console.log("c");
- console.log(localTime, parsedTokenData.accessTokenExpiresAt);
- }
- } else {
- console.log("d");
}
}
}
diff --git a/src/app/_utils/CheckToken.ts b/src/app/_utils/CheckToken.ts
index ebaacdf..abda274 100644
--- a/src/app/_utils/CheckToken.ts
+++ b/src/app/_utils/CheckToken.ts
@@ -30,15 +30,6 @@ const CheckToken = async () => {
}
}
// 모두 유효기간 지났을 때
- else if (
- accessTokenExpiresAt < localTime &&
- refreshTokenExpiresAt < localTime
- ) {
- console.log("c");
- console.log(localTime, parsedTokenData.accessTokenExpiresAt);
- }
- } else {
- console.log("d");
}
return false;
};
diff --git a/src/app/_utils/firebase.ts b/src/app/_utils/firebase.ts
index 2c9dc73..495ff4e 100644
--- a/src/app/_utils/firebase.ts
+++ b/src/app/_utils/firebase.ts
@@ -20,7 +20,9 @@ const firebaseConfig = {
const app = initializeApp(firebaseConfig);
const analytics = () =>
isSupported().then((yes) =>
- yes ? logEvent(getAnalytics(app), "start") : () => console.log("no")
+ yes
+ ? logEvent(getAnalytics(app), "start")
+ : () => console.error("Firebase Error")
);
// const startAnalytics = () => {
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 9ecdd6d..273a9d2 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -26,6 +26,7 @@ export default function RootLayout({
children: React.ReactNode;
modal: React.ReactNode;
}>) {
+ process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
return (