Skip to content

Commit 5554bbf

Browse files
authored
Merge pull request #302 from JEOLLOGA/refactor/#301/homepage-rsc
[REFACTOR] Homepage μ„œλ²„ μ»΄ν¬λ„ŒνŠΈ μ „ν™˜
2 parents b308b6f + eb628d4 commit 5554bbf

File tree

12 files changed

+43
-25
lines changed

12 files changed

+43
-25
lines changed

β€Žnext.config.tsβ€Ž

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,31 @@ const withVanillaExtract = createVanillaExtractPlugin();
55

66
const nextConfig: NextConfig = {
77
reactStrictMode: true,
8+
89
images: {
910
domains: ['noms.templestay.com', 'www.templestay.com'],
1011
},
12+
1113
webpack(config) {
12-
config.module.rules.push({
13-
test: /\.svg$/,
14-
issuer: /\.[jt]sx?$/,
15-
use: [
16-
{
17-
loader: '@svgr/webpack',
18-
options: {
19-
memo: true,
20-
},
21-
},
22-
],
23-
});
14+
const fileLoaderRule = config.module.rules.find((rule) => rule.test?.test?.('.svg'));
15+
16+
config.module.rules.push(
17+
{
18+
...fileLoaderRule,
19+
test: /\.svg$/i,
20+
resourceQuery: /url/,
21+
},
22+
23+
{
24+
test: /\.svg$/i,
25+
issuer: fileLoaderRule.issuer,
26+
resourceQuery: { not: [...fileLoaderRule.resourceQuery.not, /url/] },
27+
use: ['@svgr/webpack'],
28+
},
29+
);
30+
31+
fileLoaderRule.exclude = /\.svg$/i;
32+
2433
return config;
2534
},
2635
};

β€Žsrc/app/page.tsxβ€Ž

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
1-
'use client';
2-
3-
import { useGetNickname } from '@apis/user';
41
import HomeClient from '@app/HomeClient';
52
import LookCard from '@components/card/lookCard/LookCard';
63
import MapCard from '@components/card/mapCard/MapCard';
74
import CurationCarousel from '@components/carousel/curationCarousel/CurationCarousel';
85
import DetailTitle from '@components/detailTitle/DetailTitle';
9-
import ExceptLayout from '@components/except/exceptLayout/ExceptLayout';
106
import Footer from '@components/footer/Footer';
117
import Header from '@components/header/Header';
12-
import { getStorageValue } from '@hooks/useLocalStorage';
8+
import { cookies } from 'next/headers';
139

1410
import * as styles from './homePage.css';
1511

16-
const HomePage = () => {
17-
const userId = Number(getStorageValue('userId'));
18-
const { data, isLoading } = useGetNickname(userId);
19-
20-
if (isLoading) {
21-
return <ExceptLayout type="loading" />;
22-
}
12+
const HomePage = async () => {
13+
const cookieStore = await cookies();
14+
const userName = cookieStore.get('userNickname')?.value;
2315

2416
return (
2517
<div className={styles.homeWrapper}>
2618
<Header />
27-
<LookCard name={data?.nickname} />
19+
<LookCard name={userName} />
2820
<MapCard />
2921
<div className={styles.curationCarouselStyle}>
3022
<DetailTitle title="μ ˆλ‘œκ°€ PICK!" />

β€Žsrc/components/card/lookCard/LookCard.tsxβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use client';
2+
13
import BasicBtn from '@components/common/button/basicBtn/BasicBtn';
24
import useFilter from '@hooks/useFilter';
35
import useEventLogger from 'src/gtm/hooks/useEventLogger';

β€Žsrc/components/card/mapCard/Map.tsxβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use client';
2+
13
import mapImage from '@assets/images/home_card_map.png';
24
import LocBtn from '@components/card/mapCard/LocBtn';
35
import { REGION_INFOS, REGION_LABEL_MAP } from '@constants/regionInfos';

β€Žsrc/components/carousel/curationCarousel/CurationCarousel.tsxβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use client';
2+
13
import CurationCard from '@components/curation/curationCard/CurationCard';
24
import { CURATION_INFO } from '@constants/curationInfo';
35
import useCarousel from '@hooks/useCarousel';

β€Žsrc/components/footer/Footer.tsxβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use client';
2+
13
import Icon from '@assets/svgs';
24
import useEventLogger from 'src/gtm/hooks/useEventLogger';
35

β€Žsrc/components/header/Header.tsxβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use client';
2+
13
import Icon from '@assets/svgs';
24
import useNavigateTo from '@hooks/useNavigateTo';
35

β€Žsrc/components/search/searchBar/SearchBar.tsxβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
'use client';
2+
23
import Icon from '@assets/svgs';
34
import useFilter from '@hooks/useFilter';
45
import { usePathname } from 'next/navigation';

β€Žsrc/hooks/useCarousel.tsβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
'use client';
2+
23
import { useState, useRef } from 'react';
34

45
interface UseCarouselProps {

β€Žsrc/hooks/useFilter.tsβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use client';
2+
13
import useFetchFilteredList from '@apis/filter';
24
import { fetchFilteredCount } from '@apis/filter/axios';
35
import useLocalStorage, { getStorageValue } from '@hooks/useLocalStorage';

0 commit comments

Comments
Β (0)