diff --git a/src/app/(default)/onboarding/page.tsx b/src/app/(default)/onboarding/page.tsx index 6e9511a5..acea4537 100644 --- a/src/app/(default)/onboarding/page.tsx +++ b/src/app/(default)/onboarding/page.tsx @@ -41,7 +41,7 @@ function OnBoardingPage() {
{Array(3) diff --git a/src/app/globals.css b/src/app/globals.css index 1a96d7bb..6dfc14a4 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -88,7 +88,7 @@ body { position: relative; display: flex; overflow: auto; - -webkit-transform:translate3d(0,0,0); + -webkit-transform: translate3d(0, 0, 0); /* PC view setting */ @media screen and (min-width: 430px) { @@ -166,6 +166,10 @@ input[type='date']::-ms-expand { height: 100%; } +.slick-list { + height: 100%; +} + .slick-slide { height: 100%; } diff --git a/src/components/OnBoarding/OnBoardingSlide.tsx b/src/components/OnBoarding/OnBoardingSlide.tsx index 026fbce5..e9596633 100644 --- a/src/components/OnBoarding/OnBoardingSlide.tsx +++ b/src/components/OnBoarding/OnBoardingSlide.tsx @@ -1,12 +1,10 @@ import React from 'react'; import { onBoarding } from '@/data/ui/onBoarding'; -import { useRouter } from 'next/navigation'; import Slider, { Settings } from 'react-slick'; import Slide1 from 'public/images/onBoarding/slide-1.svg'; import Slide2 from 'public/images/onBoarding/slide-2.svg'; import Slide3 from 'public/images/onBoarding/slide-3.svg'; import LightBg from 'public/images/flash/light-bg-onboarding.svg'; -import BackButton from '../Button/BackButton'; interface Props { setActiveSlide: React.Dispatch>; @@ -14,8 +12,6 @@ interface Props { /** 온보딩 소개 슬라이드 */ function OnBoardingSlide({ setActiveSlide }: Props) { - const router = useRouter(); - const settings: Settings = { dots: false, arrows: false, @@ -23,32 +19,27 @@ function OnBoardingSlide({ setActiveSlide }: Props) { slidesToShow: 1, slidesToScroll: 1, autoplay: false, - adaptiveHeight: true, + adaptiveHeight: false, beforeChange: (_, next) => { setActiveSlide(next + 1); }, }; return ( -
- router.back()} - extraClass='px-page' - /> - -
+
+ +

{onBoarding[1].title()}

-
+
-
+

{onBoarding[2].title()}

@@ -59,7 +50,7 @@ function OnBoardingSlide({ setActiveSlide }: Props) {
-
+

{onBoarding[3].title()}

diff --git a/src/features/Well/components/Well/WellDetail.tsx b/src/features/Well/components/Well/WellDetail.tsx index 3c33f171..31bef470 100644 --- a/src/features/Well/components/Well/WellDetail.tsx +++ b/src/features/Well/components/Well/WellDetail.tsx @@ -75,7 +75,6 @@ function WellDetail({ order: newOrder, }); - console.log(prevChanges); setOrderChanges(prevChanges); setItems((prevItems) => { diff --git a/src/features/Well/components/Well/WellItem/WellItemList.tsx b/src/features/Well/components/Well/WellItem/WellItemList.tsx index f5e0e41f..6bcb776b 100644 --- a/src/features/Well/components/Well/WellItem/WellItemList.tsx +++ b/src/features/Well/components/Well/WellItem/WellItemList.tsx @@ -59,7 +59,7 @@ const WellItemList = React.memo( handleMoveItem, }: Props) => { const { wellItemCount, isLoading: isWellItemCountLoading } = - useWellItemCount(userId); + useWellItemCount(userId, isRootUser); const { baseFrogsCount } = useUserFrogsCount(); const isGotFirstFrog = localStorage.getItem(STORAGE_KEY.gotFirstFrog); diff --git a/src/features/Well/hooks/useWellItemCount.ts b/src/features/Well/hooks/useWellItemCount.ts index 7c31c52e..1eb8490d 100644 --- a/src/features/Well/hooks/useWellItemCount.ts +++ b/src/features/Well/hooks/useWellItemCount.ts @@ -2,11 +2,11 @@ import { useQuery } from '@tanstack/react-query'; import { getUserWellItemsCount } from '../api/well.api'; import { QUERY_KEY } from '@/constants/query'; -export const useWellItemCount = (userId: string) => { +export const useWellItemCount = (userId: string, isRootUser: boolean) => { const { data, isLoading } = useQuery({ queryKey: [QUERY_KEY.wellItemCount, userId], queryFn: () => getUserWellItemsCount(userId), - enabled: !!userId, + enabled: !!userId && isRootUser, }); return { diff --git a/src/middleware.ts b/src/middleware.ts index e3348d7e..43081c88 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -47,7 +47,7 @@ export async function middleware(req: NextRequest) { let newSessionToken: string | undefined = undefined; if (sessionToken && isRemember?.value === 'false' && !isLoggedIn) { - response = NextResponse.redirect(new URL('/default', req.url)); + response = NextResponse.redirect(new URL('/onboarding', req.url)); response.cookies.set(process.env.NEXTAUTH_TOKEN_NAME || '', '', { httpOnly: true, secure: true, @@ -110,7 +110,7 @@ export async function middleware(req: NextRequest) { if (pathname === '/') { if (!sessionToken) { - return NextResponse.redirect(new URL('/default', req.url)); + return NextResponse.redirect(new URL('/onboarding', req.url)); } else if (defaultWellId && !referer?.includes('/well')) { // 재발급 const redirectResponse = NextResponse.redirect(