From d00a3771f5e5c0f3d66820886841911246a89544 Mon Sep 17 00:00:00 2001 From: Chamsol Kim Date: Sun, 24 Aug 2025 13:02:02 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat=20[#92]=20Header=20logo=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=ED=95=A0=20=EB=95=8C=20=EB=A9=94=EC=9D=B8=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/header/header.jsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx index 3d3fe46..c1e66f7 100644 --- a/src/components/header/header.jsx +++ b/src/components/header/header.jsx @@ -1,3 +1,4 @@ +import { Link } from "react-router"; import styled from "styled-components"; import logoImage from "../../assets/logo.svg"; import { media } from "../../utils/media"; @@ -27,7 +28,9 @@ function Header({ className, children }) { return ( - 로고 + + 로고 +
{children}
From 68451134d3767037ec35f7ad6b2fe973f7309f3e Mon Sep 17 00:00:00 2001 From: Chamsol Kim Date: Sun, 24 Aug 2025 13:15:42 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor=20[#92]=20`OnboardingLayout`?= =?UTF-8?q?=EC=9D=98=20main=20=EC=98=81=EC=97=AD=EC=9D=B4=20header?= =?UTF-8?q?=EB=A5=BC=20=EC=A0=9C=EC=99=B8=ED=95=9C=20=EB=82=98=EB=A8=B8?= =?UTF-8?q?=EC=A7=80=20=EA=B3=B5=EA=B0=84=EC=9D=84=20=EC=B1=84=EC=9A=B0?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/onboarding-layout.jsx | 26 +++++++++++++++++++++----- src/pages/rolling-paper-list-page.jsx | 11 +++++------ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/layouts/onboarding-layout.jsx b/src/layouts/onboarding-layout.jsx index beab0ed..feb5d44 100644 --- a/src/layouts/onboarding-layout.jsx +++ b/src/layouts/onboarding-layout.jsx @@ -1,24 +1,40 @@ import { useNavigate } from "react-router"; +import styled from "styled-components"; import { OutlinedButton } from "../components/button/button"; import BUTTON_SIZE from "../components/button/button-size"; import Header from "../components/header/header"; +const LayoutHeader = styled(Header)` + flex-shrink: 0; +`; + +const Main = styled.main` + flex-grow: 1; + min-height: 100vh - 64px; +`; + +const StyledOnbardingLayout = styled.div` + display: flex; + flex-direction: column; + height: 100vh; +`; + function OnboardingLayout({ children }) { const navigate = useNavigate(); const handlePostCreate = () => navigate("/post"); return ( - <> -
+ + -
-
{children}
- + +
{children}
+ ); } diff --git a/src/pages/rolling-paper-list-page.jsx b/src/pages/rolling-paper-list-page.jsx index 425f9cc..bee7334 100644 --- a/src/pages/rolling-paper-list-page.jsx +++ b/src/pages/rolling-paper-list-page.jsx @@ -1,17 +1,16 @@ -import { PrimaryButton } from "../components/button/button"; -import BUTTON_SIZE from "../components/button/button-size"; -import React, { useEffect, useState, useMemo } from "react"; +import { useEffect, useMemo, useState } from "react"; import { useNavigate } from "react-router"; import styled from "styled-components"; +import { apiClient } from "../api/client"; +import { PrimaryButton } from "../components/button/button"; +import BUTTON_SIZE from "../components/button/button-size"; import RollingPaperList from "../features/rolling-paper/components/rolling-paper-list"; -import { media } from "../utils/media"; import { useMedia } from "../hooks/use-media"; -import { apiClient } from "../api/client"; +import { media } from "../utils/media"; const TopContainer = styled.div` text-align: center; margin-top: 50px; - min-height: calc(100vh - 64px); display: flex; flex-direction: column; `; From 6fded8fbf2a93e4832e3462f85b9fb3c8e8a3e2c Mon Sep 17 00:00:00 2001 From: Chamsol Kim Date: Sun, 24 Aug 2025 13:17:26 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20[]=20=ED=8C=8C=EC=9D=BC=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=EA=B3=BC=20=EB=8F=99=EC=9D=BC=ED=95=9C=20component=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/rolling-paper-list-page.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/rolling-paper-list-page.jsx b/src/pages/rolling-paper-list-page.jsx index bee7334..7e780dc 100644 --- a/src/pages/rolling-paper-list-page.jsx +++ b/src/pages/rolling-paper-list-page.jsx @@ -71,7 +71,7 @@ function getCachedImage(url) { return cache[url].src; } -function ShowMessageList() { +function RollingPaperListPage() { const navigate = useNavigate(); const [recipientsData, setRecipientsData] = useState([]); @@ -187,4 +187,4 @@ function ShowMessageList() { ); } -export default ShowMessageList; +export default RollingPaperListPage;