Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Design: 글로벌 스타일 수정에 따른 전체 페이지 스타일 조정 #278

Merged
merged 18 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9aa982e
Design: 글로벌 스타일 수정에 따른 홈(home) 페이지 스타일 수정
ParkSohyunee Nov 21, 2024
2759bd7
Design: 글로벌 스타일 수정에 따른 마이피드 페이지, 콜렉션 페이지 스타일 수정
ParkSohyunee Nov 21, 2024
5cccb5b
Design: 글로벌 스타일 수정에 따른 설정페이지, 프로필수정 페이지, 탈퇴페이지 스타일 수정
ParkSohyunee Nov 21, 2024
92e507f
Design: 글로벌 스타일 수정에 따른 요청 주제 페이지, 탈퇴 알림페이지, 온보딩 페이지, 알림페이지 스타일 수정
ParkSohyunee Nov 21, 2024
a1ecd58
Design: 리스트 상세페이지, 히스토리 페이지 max-width, height 수정
ParkSohyunee Nov 22, 2024
68929c7
Design: 인트로페이지, 홈페이지 일부(트랜딩 리스트, 추천 리스터), 콜렉션 페이지 일부 스타일 수정
ParkSohyunee Nov 23, 2024
17a364f
Design: 팔로잉/팔로워 페이지 넓이, 높이 수정 및 배경색 등 스타일 일부 수정
ParkSohyunee Nov 23, 2024
ab7cb5e
Design: 공통 컴포넌트 (모달, NoData, 하단네브바) 글로벌스타일에 맞게 수정
ParkSohyunee Nov 23, 2024
4ef4443
Style: (홈)페이지 사용하지 않는 API 주석처리
ParkSohyunee Nov 23, 2024
76a3a10
Design: 리스트 생성/수정 페이지 넓이, 높이 수정
ParkSohyunee Nov 23, 2024
0c3ca4a
Design: 로그인 리다이렉트 페이지 스타일 수정
ParkSohyunee Nov 23, 2024
26c428a
Design: 글로벌 스타일 수정 및 최종 스타일 점검
ParkSohyunee Nov 23, 2024
fb33d4e
Chore: 빌드 에러 해결을 위한 babel/runtime 라이브러리 설치
ParkSohyunee Nov 23, 2024
2f8fc23
Feat: Next.js 미들웨어를 사용하여 url pathname에 따라 다른 페이지 레이아웃 스타일 적용
ParkSohyunee Dec 5, 2024
b786f72
Design: 레이아웃 스타일에 따라 전체 페이지 스타일 수정
ParkSohyunee Dec 5, 2024
e2d0ed7
Merge branch 'dev' into feature/page-style
ParkSohyunee Dec 5, 2024
276630c
Merge branch 'feature/page-style' of https://github.com/ParkSohyunee/…
ParkSohyunee Dec 5, 2024
eedd7f0
Design: 히스토리 페이지 스타일 수정
ParkSohyunee Dec 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.26.0",
"@egjs/react-grid": "^1.16.0",
"@hello-pangea/dnd": "^17.0.0",
"@mui/material": "^5.15.9",
Expand Down
6 changes: 5 additions & 1 deletion src/app/(home)/_components/FeedLists.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ 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',
flexDirection: 'column',
});

export const feedList = style({
listStyle: 'none',
});

export const titleWrapper = style({
marginBottom: '26px',

Expand Down
5 changes: 1 addition & 4 deletions src/app/(home)/_components/FeedLists.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ function FeedLists({ category, tab = 'recent' }: FeedListsType) {
// </section>
// );
// }
console.log(category);

console.log(feedLists);

return (
<section className={styles.wrapperOuter}>
Expand All @@ -87,7 +84,7 @@ function FeedLists({ category, tab = 'recent' }: FeedListsType) {
feedLists?.map((item, index) => {
return (
<Link href={`/list/${item.id}`} key={item.id}>
<li>
<li className={styles.feedList}>
<FeedListItem item={item} index={index} />
</li>
</Link>
Expand Down
4 changes: 4 additions & 0 deletions src/app/(home)/_components/TopicsRecommendation.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ export const itemsWrapper = style({
},
});

export const topicList = style({
listStyle: 'none',
});

export const topic = style({
padding: '14px',

Expand Down
2 changes: 1 addition & 1 deletion src/app/(home)/_components/TopicsRecommendation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function TopicsRecommendation() {
<ul className={styles.itemsWrapper}>
{TopicsData.map((el, idx) => {
return (
<li key={idx}>
<li key={idx} className={styles.topicList}>
<TopicItem title={el} />
</li>
);
Expand Down
8 changes: 7 additions & 1 deletion src/app/(home)/_components/TrendingLists.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ export const testItem = style({
height: '100%',
});

export const slide = style({});
export const slide = style({
maxWidth: 430,
});

export const itemWrapper = style({
width: '100%',
Expand Down Expand Up @@ -166,6 +168,8 @@ export const top3ItemNoImage = style({
backgroundColor: '#F5FAFF',
color: '#3D95FF',
borderRadius: '20px',

listStyle: 'none',
});

export const top3ItemWithImage = style({
Expand All @@ -174,6 +178,8 @@ export const top3ItemWithImage = style({
color: '#ffffff',
borderRadius: '20px',
backgroundColor: '#F5FAFF4D',

listStyle: 'none',
});

export const top3Wrapper = style({
Expand Down
16 changes: 8 additions & 8 deletions src/app/(home)/_components/TrendingLists.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
// });
Comment on lines -21 to +25
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Nahyun-Kang 나현님, 트랜딩 리스트 API 변경이 필요한 것 같아서 변경 전 콘솔창 에러를 방지하기 위해 해당 API 호출 부분은 주석처리 해두었습니다!


const SWIPER_STYLE = useMemo(
() => ({
width: '100vw',
height: '280px',
padding: '10px 0',
}),
Expand All @@ -40,9 +40,9 @@ function TrendingList() {
[]
);

if (isFetching) {
return <TrendingListsSkeleton />;
}
// if (isFetching) {
// return <TrendingListsSkeleton />;
// }

return (
<section className={styles.wrapper}>
Expand Down
9 changes: 9 additions & 0 deletions src/app/(home)/layout.css.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { vars } from '@/styles/theme.css';
import { style } from '@vanilla-extract/css';

export const wrapper = style({
maxWidth: 430,
height: '100vh',
margin: 'auto',
backgroundColor: vars.color.bggray,
});
5 changes: 3 additions & 2 deletions src/app/(home)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
import { ReactNode } from 'react';

import Header from '@/app/(home)/_components/Header';
import * as styles from './layout.css';

interface HomeLayoutProps {
children: ReactNode;
}

function HomeLayout({ children }: HomeLayoutProps) {
return (
<>
<div className={styles.wrapper}>
<Header />
{children}
</>
</div>
);
}

Expand Down
6 changes: 4 additions & 2 deletions src/app/(home)/page.css.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { vars } from '@/styles/theme.css';
import { style } from '@vanilla-extract/css';

export const wrapper = style({
marginBottom: 84,

maxWidth: 430,
margin: 'auto',
background: vars.color.bggray,
position: 'relative',
});
5 changes: 5 additions & 0 deletions src/app/account/page.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@ import * as fonts from '@/styles/font.css';
import { vars } from '@/styles/theme.css';

export const container = style({
height: '100vh',

marginTop: 18,
maxWidth: 430,
margin: 'auto',

display: 'flex',
flexDirection: 'column',
gap: 12,

padding: '0 1.6rem',
backgroundColor: vars.color.bggray,
});

export const section = style({
Expand Down
100 changes: 49 additions & 51 deletions src/app/account/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
'use client';

import { useRouter } from 'next/navigation';
import useBooleanOutput from '@/hooks/useBooleanOutput';
import Header from '@/components/Header/__Header';
import Header from '@/components/Header/Header';
import useMoveToPage from '@/hooks/useMoveToPage';

import NavigateIcon from '/public/icons/chevron_right.svg';
Expand All @@ -12,7 +13,6 @@ import MessageIcon from '/public/icons/message_square.svg';
import { useLanguage } from '@/store/useLanguage';
import { accountLocale } from '@/app/account/locale';
import LogoutModal from './_components/LogoutModal';
import LanguageDropdown from './_components/LanguageDropdown';
import * as styles from './page.css';
import SegmentedControl from '@/components/SegmentedControl/SegmentedControl';

Expand All @@ -32,65 +32,63 @@ export default function AccountPage() {
};

return (
<>
<div className={styles.container}>
<Header
left="back"
leftClick={() => {
router.back();
}}
title={accountLocale[language].settings}
/>
<div className={styles.container}>
<section className={styles.section}>
<div className={styles.buttonDiv} onClick={onClickMoveToPage('account/profile')} role="button">
<div className={styles.titleDiv}>
<UserIcon width={24} height={24} alt={accountLocale[language].profileSetting} />
{accountLocale[language].profileSetting}
</div>
<NavigateIcon width={16} height={16} />
<section className={styles.section}>
<div className={styles.buttonDiv} onClick={onClickMoveToPage('account/profile')} role="button">
<div className={styles.titleDiv}>
<UserIcon width={24} height={24} alt={accountLocale[language].profileSetting} />
{accountLocale[language].profileSetting}
</div>
</section>
<section className={styles.section}>
<div className={styles.baseDiv}>
<div className={styles.titleDiv}>
<GlobeIcon width={24} height={24} alt={accountLocale[language].changeLanguage} />
{accountLocale[language].language}
</div>
{/** TODO: <LanguageDropdown /> 제거하기 */}
<SegmentedControl
options={[accountLocale[language].korean, accountLocale[language].english]}
selected={language === 'ko' ? accountLocale[language].korean : accountLocale[language].english}
handleSelect={handleSelectLanguage}
/>
<NavigateIcon width={16} height={16} />
</div>
</section>
<section className={styles.section}>
<div className={styles.baseDiv}>
<div className={styles.titleDiv}>
<GlobeIcon width={24} height={24} alt={accountLocale[language].changeLanguage} />
{accountLocale[language].language}
</div>
</section>
<section className={styles.section}>
<div
className={styles.buttonDiv}
onClick={() => {
handleDivLinkClick('https://open.kakao.com/o/saz6DObg');
}}
>
<div className={styles.titleDiv}>
<HelpIcon width={24} height={24} alt={accountLocale[language].contact} />
{accountLocale[language].contact}
</div>
<NavigateIcon width={16} height={16} />
{/** TODO: <LanguageDropdown /> 제거하기 */}
<SegmentedControl
options={[accountLocale[language].korean, accountLocale[language].english]}
selected={language === 'ko' ? accountLocale[language].korean : accountLocale[language].english}
handleSelect={handleSelectLanguage}
/>
</div>
</section>
<section className={styles.section}>
<div
className={styles.buttonDiv}
onClick={() => {
handleDivLinkClick('https://open.kakao.com/o/saz6DObg');
}}
>
<div className={styles.titleDiv}>
<HelpIcon width={24} height={24} alt={accountLocale[language].contact} />
{accountLocale[language].contact}
</div>
<div
className={styles.buttonDiv}
onClick={() => {
handleDivLinkClick('https://tally.so/r/w51Dpv');
}}
>
<div className={styles.titleDiv}>
<MessageIcon width={24} height={24} alt={accountLocale[language].sendFeedback} />
{accountLocale[language].sendFeedback}
</div>
<NavigateIcon width={16} height={16} />
<NavigateIcon width={16} height={16} />
</div>
<div
className={styles.buttonDiv}
onClick={() => {
handleDivLinkClick('https://tally.so/r/w51Dpv');
}}
>
<div className={styles.titleDiv}>
<MessageIcon width={24} height={24} alt={accountLocale[language].sendFeedback} />
{accountLocale[language].sendFeedback}
</div>
</section>
</div>
<NavigateIcon width={16} height={16} />
</div>
</section>
<div className={styles.accountFooter}>
<button className={styles.textButton} onClick={handleSetOn}>
{accountLocale[language].logout}
Expand All @@ -101,6 +99,6 @@ export default function AccountPage() {
</button>
{isOn && <LogoutModal handleSetOff={handleSetOff} />}
</div>
</>
</div>
);
}
9 changes: 9 additions & 0 deletions src/app/account/profile/page.css.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
import { vars } from '@/styles/theme.css';
import { style } from '@vanilla-extract/css';

export const page = style({
margin: 'auto',
maxWidth: 430,
minHeight: '100vh',

display: 'flex',
flexDirection: 'column',
alignItems: 'center',

backgroundColor: vars.color.bggray,
});

export const content = style({
width: '100%',
padding: '18px 16px',

flexGrow: 1,

display: 'flex',
flexDirection: 'column',
alignItems: 'center',
Expand Down
2 changes: 1 addition & 1 deletion src/app/account/profile/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/app/account/withdraw/_component/WithdrawalHeader.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
6 changes: 5 additions & 1 deletion src/app/account/withdraw/page.css.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { vars } from '@/styles/__theme.css';
import { vars } from '@/styles/theme.css';
import { style } from '@vanilla-extract/css';

export const page = style({
height: '100vh',
overflow: 'hidden',

maxWidth: 430,
margin: 'auto',
backgroundColor: vars.color.bggray,
});

export const main = style({
Expand Down
2 changes: 2 additions & 0 deletions src/app/auth/redirect/kakao/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ export default function KakaoRedirectPage() {
alignItems: 'center',
justifyContent: 'center',
height: '100vh',
maxWidth: 430,
margin: 'auto',
}}
>
<Loading />
Expand Down
Loading