diff --git a/src/app/(home)/_components/FeedLists.css.ts b/src/app/(home)/_components/FeedLists.css.ts index 81f6e396..4f2a12c7 100644 --- a/src/app/(home)/_components/FeedLists.css.ts +++ b/src/app/(home)/_components/FeedLists.css.ts @@ -4,7 +4,7 @@ import { vars } from '@/styles/__theme.css'; export const listBackground = createVar(); export const wrapperOuter = style({ - padding: '0 16px 30px', + padding: '0 16px 84px 16px', marginTop: '12px', display: 'flex', diff --git a/src/app/(home)/_components/FeedLists.tsx b/src/app/(home)/_components/FeedLists.tsx index e9730d65..1a4e113c 100644 --- a/src/app/(home)/_components/FeedLists.tsx +++ b/src/app/(home)/_components/FeedLists.tsx @@ -73,9 +73,6 @@ function FeedLists({ category, tab = 'recent' }: FeedListsType) { // // ); // } - console.log(category); - - console.log(feedLists); return (
diff --git a/src/app/(home)/_components/TrendingLists.css.ts b/src/app/(home)/_components/TrendingLists.css.ts index a7e21e67..8cffd034 100644 --- a/src/app/(home)/_components/TrendingLists.css.ts +++ b/src/app/(home)/_components/TrendingLists.css.ts @@ -57,7 +57,9 @@ export const testItem = style({ height: '100%', }); -export const slide = style({}); +export const slide = style({ + width: '100%', +}); export const itemWrapper = style({ width: '100%', diff --git a/src/app/(home)/_components/TrendingLists.tsx b/src/app/(home)/_components/TrendingLists.tsx index 91f58d90..fe4a9439 100644 --- a/src/app/(home)/_components/TrendingLists.tsx +++ b/src/app/(home)/_components/TrendingLists.tsx @@ -18,14 +18,14 @@ import { vars } from '@/styles/theme.css'; import { TrendingListsSkeleton } from '../../../components/exploreComponents/Skeleton'; function TrendingList() { - const { data: trendingLists, isFetching } = useQuery({ - queryKey: [QUERY_KEYS.getTrendingLists], - queryFn: () => getTrendingLists(), - }); + // 오류로인해 주석처리 해 둠 + // const { data: trendingLists, isFetching } = useQuery({ + // queryKey: [QUERY_KEYS.getTrendingLists], + // queryFn: () => getTrendingLists(), + // }); const SWIPER_STYLE = useMemo( () => ({ - width: '100vw', height: '280px', padding: '10px 0', }), @@ -40,9 +40,9 @@ function TrendingList() { [] ); - if (isFetching) { - return ; - } + // if (isFetching) { + // return ; + // } return (
diff --git a/src/app/(home)/page.css.ts b/src/app/(home)/page.css.ts deleted file mode 100644 index 1e49ac02..00000000 --- a/src/app/(home)/page.css.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { style } from '@vanilla-extract/css'; - -export const wrapper = style({ - marginBottom: 84, - - position: 'relative', -}); diff --git a/src/app/(home)/page.tsx b/src/app/(home)/page.tsx index aa36942a..fc9e79df 100644 --- a/src/app/(home)/page.tsx +++ b/src/app/(home)/page.tsx @@ -10,8 +10,6 @@ import LoginModal from '@/components/login/LoginModal'; import Loading from '@/components/loading/Loading'; import Feed from '@/app/(home)/_components/Feed'; -import * as styles from './page.css'; - import useBooleanOutput from '@/hooks/useBooleanOutput'; import toasting from '@/lib/utils/toasting'; import toastMessage from '@/lib/constants/toastMessage'; @@ -40,7 +38,7 @@ function LandingPage() { return ( <> -
+
}> +
{ @@ -40,57 +40,55 @@ export default function AccountPage() { }} title={accountLocale[language].settings} /> -
-
-
-
- - {accountLocale[language].profileSetting} -
- +
+
+
+ + {accountLocale[language].profileSetting}
-
-
-
-
- - {accountLocale[language].language} -
- {/** TODO: 제거하기 */} - + +
+
+
+
+
+ + {accountLocale[language].language}
-
-
-
{ - handleDivLinkClick('https://open.kakao.com/o/saz6DObg'); - }} - > -
- - {accountLocale[language].contact} -
- + {/** TODO: 제거하기 */} + +
+
+
+
{ + handleDivLinkClick('https://open.kakao.com/o/saz6DObg'); + }} + > +
+ + {accountLocale[language].contact}
-
{ - handleDivLinkClick('https://tally.so/r/w51Dpv'); - }} - > -
- - {accountLocale[language].sendFeedback} -
- + +
+
{ + handleDivLinkClick('https://tally.so/r/w51Dpv'); + }} + > +
+ + {accountLocale[language].sendFeedback}
-
-
+ +
+
{isOn && }
- + ); } diff --git a/src/app/account/profile/page.css.ts b/src/app/account/profile/page.css.ts index ea25af2b..c2906b8c 100644 --- a/src/app/account/profile/page.css.ts +++ b/src/app/account/profile/page.css.ts @@ -10,6 +10,8 @@ export const content = style({ width: '100%', padding: '18px 16px', + flexGrow: 1, + display: 'flex', flexDirection: 'column', alignItems: 'center', diff --git a/src/app/account/profile/page.tsx b/src/app/account/profile/page.tsx index d768bb79..17f08bb1 100644 --- a/src/app/account/profile/page.tsx +++ b/src/app/account/profile/page.tsx @@ -13,7 +13,7 @@ import toastMessage from '@/lib/constants/toastMessage'; import { useUser } from '@/store/useUser'; import getUserOne from '@/app/_api/user/getUserOne'; import updateProfile from '@/app/_api/user/updateProfile'; -import Header from '@/components/Header/__Header'; +import Header from '@/components/Header/Header'; import BlueButton from '@/components/BlueButton/BlueButton'; import ProfileForm from './_components/ProfileForm'; diff --git a/src/app/account/withdraw/_component/WithdrawalHeader.tsx b/src/app/account/withdraw/_component/WithdrawalHeader.tsx index 19f6a990..08d46f96 100644 --- a/src/app/account/withdraw/_component/WithdrawalHeader.tsx +++ b/src/app/account/withdraw/_component/WithdrawalHeader.tsx @@ -1,6 +1,6 @@ 'use client'; import { useRouter } from 'next/navigation'; -import Header from '@/components/Header/__Header'; +import Header from '@/components/Header/Header'; import { accountLocale } from '@/app/account/locale'; import { useLanguage } from '@/store/useLanguage'; diff --git a/src/app/account/withdraw/page.css.ts b/src/app/account/withdraw/page.css.ts index f0f1c15e..2195d22b 100644 --- a/src/app/account/withdraw/page.css.ts +++ b/src/app/account/withdraw/page.css.ts @@ -1,11 +1,5 @@ -import { vars } from '@/styles/__theme.css'; import { style } from '@vanilla-extract/css'; -export const page = style({ - height: '100vh', - overflow: 'hidden', -}); - export const main = style({ height: '100%', padding: '30px 0', diff --git a/src/app/account/withdraw/page.tsx b/src/app/account/withdraw/page.tsx index 57f7a8a6..d43eea78 100644 --- a/src/app/account/withdraw/page.tsx +++ b/src/app/account/withdraw/page.tsx @@ -5,7 +5,7 @@ import * as styles from './page.css'; export default function WithdrawPage() { return ( -
+
diff --git a/src/app/collection/[folderId]/page.css.ts b/src/app/collection/[folderId]/page.css.ts index e7737ed9..7a9faedd 100644 --- a/src/app/collection/[folderId]/page.css.ts +++ b/src/app/collection/[folderId]/page.css.ts @@ -2,11 +2,6 @@ import { style } from '@vanilla-extract/css'; import { vars } from '@/styles/theme.css'; import { Subtitle } from '@/styles/font.css'; -export const container = style({ - height: '100vh', - backgroundColor: vars.color.bggray, -}); - // BottomSheet Input export const contentInput = style({ padding: '2rem 2.4rem', diff --git a/src/app/collection/[folderId]/page.tsx b/src/app/collection/[folderId]/page.tsx index 85f962f9..00896bdc 100644 --- a/src/app/collection/[folderId]/page.tsx +++ b/src/app/collection/[folderId]/page.tsx @@ -128,7 +128,7 @@ export default function CollectionDetailPage({ params }: ParamType) { }, []); return ( -
+
@@ -53,7 +57,7 @@ export default function Layout({ children }: { children: ReactNode }) { - +