Skip to content

Feat/markup/landing-page/DEVING-78 랜딩 페이지 #82

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.

Sign up for GitHub

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

Merged
Lee-Dong-Seok merged 5 commits into from
Mar 18, 2025
Merged

Feat/markup/landing-page/DEVING-78 랜딩 페이지 #82

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46593d3
style(DEVING-78): 상단 -마진 추가
Lee-Dong-Seok Mar 17, 2025
69a1a2b
feat(DEVING-78): Footer 구현 및 전역 설정
Lee-Dong-Seok Mar 17, 2025
3c922ee
Merge branch 'dev' into feat/markup/landing-page/DEVING-78
Lee-Dong-Seok Mar 17, 2025
f41fdf2
feat(DEVING-78): lg사이즈 framer motion 애니메이션 구현 및 시작하기 클릭 시모각코로 페이지 이동
Lee-Dong-Seok Mar 17, 2025
3bc6dfb
Merge branch 'feat/markup/landing-page/DEVING-78' of https://github.c…
Lee-Dong-Seok Mar 17, 2025
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
2 changes: 1 addition & 1 deletion src/app/(user-page)/mypage/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default async function MyPage() {
await prefetchProfileData(queryClient);

return (
<div className="flex flex-col px-[24px] pb-[100px] pt-[80px]">
<div className="flex flex-col px-[24px] pb-[100px]">
<HydrationBoundary state={dehydrate(queryClient)}>
<div className="md:mb-8">
<ProfileImage />
Expand Down
2 changes: 2 additions & 0 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Footer from '@/components/common/Footer';
import Header from '@/components/common/Header';
import { ToastProvider } from '@/components/common/ToastContext';
import ReactQueryProviders from '@/hooks/useReactQuery';
Expand Down Expand Up @@ -31,7 +32,7 @@
return res.data.data;
} catch (error) {
if (error instanceof AxiosError) {
console.log('error: ', error.status);

Check warning on line 35 in src/app/layout.tsx

View workflow job for this annotation

GitHub Actions / check 

Unexpected console statement
}
return null;
}
Expand All @@ -51,6 +52,7 @@
<ToastProvider>
<Header userInfo={userInfo} />
<div className="m-auto max-w-[1340px] pt-20">{children}</div>
<Footer />
</ToastProvider>
</ReactQueryProviders>
<div id="modal-root" />
Expand Down
Loading
Loading