From d0110a536226dec8838b57824dccd3717fc74018 Mon Sep 17 00:00:00 2001 From: PARKGEONTAE <112490505+prkgnt@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:13:39 +0900 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20caniuse=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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", From 7a5f93079be65c87250eab19de9911a5259dbdca Mon Sep 17 00:00:00 2001 From: PARKGEONTAE <112490505+prkgnt@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:14:18 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20contentsCount=EB=A5=BC=20=ED=81=B4?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EC=96=B8=ED=8A=B8=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EB=93=9C=EC=97=90=EC=84=9C=20=EB=B0=9B=EC=95=84=EC=98=A4?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContentSlider/ContentSlider.tsx | 24 +++++++++++-------- src/app/(home)/_components/Home/Home.tsx | 10 ++++---- 2 files changed, 20 insertions(+), 14 deletions(-) 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({
- + + +
From 7f79661d8b7afd84721632c94006168c55844162 Mon Sep 17 00:00:00 2001 From: PARKGEONTAE <112490505+prkgnt@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:14:50 +0900 Subject: [PATCH 3/5] =?UTF-8?q?type:=20useParams=EC=9D=98=20=EB=B0=98?= =?UTF-8?q?=ED=99=98=20=ED=83=80=EC=9E=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/_hooks/useParams.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); }; From 5e98bbac7ef8401d0bdee406e2b3647b60ab753c Mon Sep 17 00:00:00 2001 From: PARKGEONTAE <112490505+prkgnt@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:34:09 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20SSL=20=EC=9D=B8=EC=A6=9D=EC=84=9C=20?= =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/layout.tsx | 1 + 1 file changed, 1 insertion(+) 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 ( Date: Mon, 13 Jan 2025 14:34:18 +0900 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=EB=A1=9C=EA=B7=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(home)/page.tsx | 1 - .../_components/SaveContentModal/SaveContentModal.tsx | 1 - src/app/_utils/CheckLocalStorage.tsx | 11 ----------- src/app/_utils/CheckToken.ts | 9 --------- src/app/_utils/firebase.ts | 4 +++- 5 files changed, 3 insertions(+), 23 deletions(-) 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/_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 = () => {