From 90412d0b52bc10427c8841a652ad785469a97ac2 Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 11:45:49 +0900
Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=EC=9E=84=EC=8B=9C=EB=A1=9C=20?=
=?UTF-8?q?=EC=84=B8=EB=B6=80=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=9D=BC?=
=?UTF-8?q?=EC=9A=B0=ED=84=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/Router.tsx | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/router/Router.tsx b/src/router/Router.tsx
index fefce05c..5e88ceb2 100644
--- a/src/router/Router.tsx
+++ b/src/router/Router.tsx
@@ -2,6 +2,8 @@ import { createBrowserRouter } from 'react-router-dom';
import Main from '../pages/Main';
import Mypage from '../pages/Mypage';
import Layout from '../layouts/Layout';
+import GiftHomeDetailFriends from '../pages/GiftHomeDetail/GiftHomeDetailFriends';
+import GiftHomeDetail2030 from '../pages/GiftHomeDetail/GiftHomeDetail2030';
const router = createBrowserRouter([
{
@@ -16,6 +18,16 @@ const router = createBrowserRouter([
path: '/mypage',
element: ,
},
+ {
+ // 임의로 세부페이지 추가
+ path: '/giftdetailfriends',
+ element: ,
+ },
+ {
+ // 임의로 세부페이지 추가
+ path: '/giftdetail2030',
+ element: ,
+ },
],
},
]);
From 6d34a1ff6052be5db1125e13f63b1a897eeff223 Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 11:47:13 +0900
Subject: [PATCH 02/10] =?UTF-8?q?style:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?=
=?UTF-8?q?=EB=B7=B0=20=EA=B0=80=EB=A1=9C=ED=8F=AD=20=EC=A1=B0=EC=A0=95=20?=
=?UTF-8?q?=EB=B0=8F=20=ED=8C=A8=EB=94=A9=20=EC=97=86=EC=95=A0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/style/GlobalStyle.ts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/style/GlobalStyle.ts b/src/style/GlobalStyle.ts
index 2cd60cd0..749f5414 100644
--- a/src/style/GlobalStyle.ts
+++ b/src/style/GlobalStyle.ts
@@ -1,5 +1,5 @@
-import { createGlobalStyle } from "styled-components";
-import reset from "styled-reset";
+import { createGlobalStyle } from 'styled-components';
+import reset from 'styled-reset';
export const GlobalStyle = createGlobalStyle`
@@ -22,9 +22,9 @@ ${reset}
}
#root, body, html {
scrollbar-width: none; /* 파이어폭스 스크롤바 숨김 */
-
- max-width: 43rem;
+ max-width: 37.5rem;
margin: 0 auto;
+ padding:0;
font-size: 62.5%;
-ms-overflow-style: none; /* 인터넷 익스플로러 스크롤바 숨김 */
scrollbar-width: none; /* 파이어폭스 스크롤바 숨김 */
From 1f6aa0f41b53e577aafeb5e77cde8587b0cc919f Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 11:47:45 +0900
Subject: [PATCH 03/10] =?UTF-8?q?style:=20=EC=84=A0=EB=AC=BC=ED=99=88=20?=
=?UTF-8?q?=EC=84=B8=EB=B6=80=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B3=B5?=
=?UTF-8?q?=ED=86=B5=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../GiftHomeDetail/GiftHomeDetail.styled.ts | 54 +++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
diff --git a/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts b/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
new file mode 100644
index 00000000..e2f2a5f6
--- /dev/null
+++ b/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
@@ -0,0 +1,54 @@
+import styled from 'styled-components';
+
+export const GiftHomeDetailWrapper = styled.div`
+ width: 100%;
+ padding: 0 2rem;
+
+ display: flex;
+ justify-content: space-between;
+ flex-wrap: wrap;
+
+ background-color: ${({ theme }) => theme.colors.white};
+`;
+
+export const GiftsItemWrapper = styled.div`
+ width: 16rem;
+ height: 25.7rem;
+ padding: 0;
+
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+`;
+
+export const GiftsItemImage = styled.img`
+ width: 16rem;
+ height: 16rem;
+
+ border-radius: 1rem;
+ background-color: ${({ theme }) => theme.colors.G_03};
+ border: 1px solid ${({ theme }) => theme.colors.G_02};
+`;
+
+export const GiftsItemTitle = styled.p`
+ display: -webkit-box;
+ width: 12.8rem;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+
+ ${({ theme }) => theme.fonts.body_09};
+ overflow: hidden;
+ color: ${({ theme }) => theme.colors.black};
+ text-overflow: ellipsis;
+ text-align: left;
+`;
+
+export const GiftsItemPrice = styled.span`
+ ${({ theme }) => theme.fonts.body_07};
+ color: ${({ theme }) => theme.colors.black};
+`;
+
+export const GiftsItemUser = styled.span`
+ ${({ theme }) => theme.fonts.caption_02};
+ color: ${({ theme }) => theme.colors.G_08};
+`;
From 1024842874547353002c79e348724266ceb5cdc6 Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 11:48:00 +0900
Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=EC=84=A0=EB=AC=BC=ED=99=88=20?=
=?UTF-8?q?=EC=B9=9C=EA=B5=AC,=202030=20=EC=84=B8=EB=B6=80=20=ED=8E=98?=
=?UTF-8?q?=EC=9D=B4=EC=A7=80=20UI=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../GiftHomeDetail/GiftHomeDetail2030.tsx | 38 +++++++++++++++
.../GiftHomeDetail/GiftHomeDetailFriends.tsx | 48 +++++++++++++++++++
2 files changed, 86 insertions(+)
create mode 100644 src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
create mode 100644 src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
diff --git a/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
new file mode 100644
index 00000000..3c5a2f4a
--- /dev/null
+++ b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
@@ -0,0 +1,38 @@
+import * as S from '../../components/GiftHomeDetail/GiftHomeDetail.styled';
+
+function GiftHomeDetail() {
+ const price = 42000;
+ const name = '왕호은';
+ return (
+
+ {/* 공통 헤더 추가 예정 */}
+ {/* 미니 타이머 추가 예정 */}
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+ {name}
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+ {name}
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+ {name}
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+ {name}
+
+
+ );
+}
+
+export default GiftHomeDetail;
diff --git a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
new file mode 100644
index 00000000..8023ff93
--- /dev/null
+++ b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
@@ -0,0 +1,48 @@
+import * as S from '../../components/GiftHomeDetail/GiftHomeDetail.styled';
+
+function GiftHomeDetail() {
+ const price = 42000;
+ const name = '왕호은';
+ const people = 3;
+
+ return (
+
+ {/* 공통 헤더 추가 예정 */}
+ {/* 미니 타이머 추가 예정 */}
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+
+ {name} | 인당 {Math.floor(price / people)}원
+
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+
+ {name} | 인당 {Math.floor(price / people)}원
+
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+
+ {name} | 인당 {Math.floor(price / people)}원
+
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+
+ {name} | 인당 {Math.floor(price / people)}원
+
+
+
+ );
+}
+
+export default GiftHomeDetail;
From 59b072f87eafa90c546e3104d343bcc3532ead3b Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:59:21 +0900
Subject: [PATCH 05/10] =?UTF-8?q?feat:=20=EB=AF=B8=EB=8B=88=20=ED=83=80?=
=?UTF-8?q?=EC=9D=B4=EB=A8=B8=20UI=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../GiftHomeDetail/GiftHomeDetail.styled.ts | 18 ++++++++++++++++++
.../GiftHomeDetail/GiftHomeDetailFriends.tsx | 4 ++++
2 files changed, 22 insertions(+)
diff --git a/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts b/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
index e2f2a5f6..c563dd7e 100644
--- a/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
+++ b/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
@@ -11,6 +11,24 @@ export const GiftHomeDetailWrapper = styled.div`
background-color: ${({ theme }) => theme.colors.white};
`;
+export const GiftsDetailTimerWrapper = styled.div`
+ padding: 0.3rem 1rem;
+ margin: 2.2rem 0 1.2rem 0;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ column-gap: 0.4rem;
+
+ border-radius: 1.4rem;
+ background: ${({ theme }) => theme.colors.G_01};
+`;
+
+export const GiftsDetailTimerNumbers = styled.span`
+ ${({ theme }) => theme.fonts.body_09};
+ color: ${({ theme }) => theme.colors.P_06};
+`;
export const GiftsItemWrapper = styled.div`
width: 16rem;
height: 25.7rem;
diff --git a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
index 8023ff93..910847b1 100644
--- a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
+++ b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
@@ -4,9 +4,13 @@ function GiftHomeDetail() {
const price = 42000;
const name = '왕호은';
const people = 3;
+ const time = '00:00:00';
return (
+
+ {time}
+
{/* 공통 헤더 추가 예정 */}
{/* 미니 타이머 추가 예정 */}
From d00ca9a220e67400f3b2099d4afe204e2f269f27 Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 15:16:14 +0900
Subject: [PATCH 06/10] =?UTF-8?q?feat:=20=EB=AF=B8=EB=8B=88=ED=83=80?=
=?UTF-8?q?=EC=9D=B4=EB=A8=B8=20UI=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../GiftHomeDetail/GiftHomeDetail.styled.ts | 15 +++-
.../GiftHomeDetail/GiftHomeDetail2030.tsx | 60 ++++++++-------
.../GiftHomeDetail/GiftHomeDetailFriends.tsx | 73 ++++++++++---------
3 files changed, 83 insertions(+), 65 deletions(-)
diff --git a/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts b/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
index c563dd7e..5def8c4c 100644
--- a/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
+++ b/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
@@ -1,5 +1,15 @@
import styled from 'styled-components';
+export const GiftHomeDetailPageWrapper = styled.div`
+ width: 100%;
+
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ background-color: ${({ theme }) => theme.colors.white};
+`;
+
export const GiftHomeDetailWrapper = styled.div`
width: 100%;
padding: 0 2rem;
@@ -7,11 +17,12 @@ export const GiftHomeDetailWrapper = styled.div`
display: flex;
justify-content: space-between;
flex-wrap: wrap;
-
- background-color: ${({ theme }) => theme.colors.white};
`;
export const GiftsDetailTimerWrapper = styled.div`
+ width: 10.3rem;
+ height: 2.7rem;
+
padding: 0.3rem 1rem;
margin: 2.2rem 0 1.2rem 0;
diff --git a/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
index 3c5a2f4a..3807a8e0 100644
--- a/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
+++ b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
@@ -3,35 +3,41 @@ import * as S from '../../components/GiftHomeDetail/GiftHomeDetail.styled';
function GiftHomeDetail() {
const price = 42000;
const name = '왕호은';
+ const time = '00:00:00';
+
return (
-
+
{/* 공통 헤더 추가 예정 */}
- {/* 미니 타이머 추가 예정 */}
-
-
- 어센틱 로고 후디 멜란지 그레이
- {price}원
- {name}
-
-
-
- 어센틱 로고 후디 멜란지 그레이
- {price}원
- {name}
-
-
-
- 어센틱 로고 후디 멜란지 그레이
- {price}원
- {name}
-
-
-
- 어센틱 로고 후디 멜란지 그레이
- {price}원
- {name}
-
-
+
+ {time}
+
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+ {name}
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+ {name}
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+ {name}
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+ {name}
+
+
+
);
}
diff --git a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
index 910847b1..8e595baa 100644
--- a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
+++ b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
@@ -7,45 +7,46 @@ function GiftHomeDetail() {
const time = '00:00:00';
return (
-
+
+ {/* 공통 헤더 추가 예정 */}
{time}
- {/* 공통 헤더 추가 예정 */}
- {/* 미니 타이머 추가 예정 */}
-
-
- 어센틱 로고 후디 멜란지 그레이
- {price}원
-
- {name} | 인당 {Math.floor(price / people)}원
-
-
-
-
- 어센틱 로고 후디 멜란지 그레이
- {price}원
-
- {name} | 인당 {Math.floor(price / people)}원
-
-
-
-
- 어센틱 로고 후디 멜란지 그레이
- {price}원
-
- {name} | 인당 {Math.floor(price / people)}원
-
-
-
-
- 어센틱 로고 후디 멜란지 그레이
- {price}원
-
- {name} | 인당 {Math.floor(price / people)}원
-
-
-
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+
+ {name} | 인당 {Math.floor(price / people)}원
+
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+
+ {name} | 인당 {Math.floor(price / people)}원
+
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+
+ {name} | 인당 {Math.floor(price / people)}원
+
+
+
+
+ 어센틱 로고 후디 멜란지 그레이
+ {price}원
+
+ {name} | 인당 {Math.floor(price / people)}원
+
+
+
+
);
}
From 53ec36fa86e9bf539babcd0ca2d14e9e7934c5a6 Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:21:15 +0900
Subject: [PATCH 07/10] =?UTF-8?q?feat:=20=EB=AF=B8=EB=8B=88=ED=83=80?=
=?UTF-8?q?=EC=9D=B4=EB=A8=B8=20=EA=B3=B5=ED=86=B5=20=EC=BB=B4=ED=8F=AC?=
=?UTF-8?q?=EB=84=8C=ED=8A=B8=EB=A1=9C=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../GiftHomeDetail/GiftHomeDetail.styled.ts | 21 -----------------
.../common/MiniTimer/MiniTimer.styled.ts | 23 +++++++++++++++++++
src/components/common/MiniTimer/MiniTimer.tsx | 16 +++++++++++++
.../GiftHomeDetail/GiftHomeDetail2030.tsx | 5 ++--
.../GiftHomeDetail/GiftHomeDetailFriends.tsx | 5 ++--
5 files changed, 43 insertions(+), 27 deletions(-)
create mode 100644 src/components/common/MiniTimer/MiniTimer.styled.ts
create mode 100644 src/components/common/MiniTimer/MiniTimer.tsx
diff --git a/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts b/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
index 5def8c4c..f335f0be 100644
--- a/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
+++ b/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
@@ -19,27 +19,6 @@ export const GiftHomeDetailWrapper = styled.div`
flex-wrap: wrap;
`;
-export const GiftsDetailTimerWrapper = styled.div`
- width: 10.3rem;
- height: 2.7rem;
-
- padding: 0.3rem 1rem;
- margin: 2.2rem 0 1.2rem 0;
-
- display: flex;
- justify-content: center;
- align-items: center;
-
- column-gap: 0.4rem;
-
- border-radius: 1.4rem;
- background: ${({ theme }) => theme.colors.G_01};
-`;
-
-export const GiftsDetailTimerNumbers = styled.span`
- ${({ theme }) => theme.fonts.body_09};
- color: ${({ theme }) => theme.colors.P_06};
-`;
export const GiftsItemWrapper = styled.div`
width: 16rem;
height: 25.7rem;
diff --git a/src/components/common/MiniTimer/MiniTimer.styled.ts b/src/components/common/MiniTimer/MiniTimer.styled.ts
new file mode 100644
index 00000000..a571eb09
--- /dev/null
+++ b/src/components/common/MiniTimer/MiniTimer.styled.ts
@@ -0,0 +1,23 @@
+import styled from 'styled-components';
+
+export const MiniTimerWrapper = styled.div`
+ width: 10.3rem;
+ height: 2.7rem;
+
+ padding: 0.3rem 1rem;
+ margin: 2.2rem 0 1.2rem 0;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ column-gap: 0.4rem;
+
+ border-radius: 1.4rem;
+ background: ${({ theme }) => theme.colors.G_01};
+`;
+
+export const MiniTimerNumbers = styled.span`
+ ${({ theme }) => theme.fonts.body_09};
+ color: ${({ theme }) => theme.colors.P_06};
+`;
diff --git a/src/components/common/MiniTimer/MiniTimer.tsx b/src/components/common/MiniTimer/MiniTimer.tsx
new file mode 100644
index 00000000..1a7c027b
--- /dev/null
+++ b/src/components/common/MiniTimer/MiniTimer.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import * as S from './MiniTimer.styled';
+
+interface MiniTimerProps {
+ time: string;
+}
+
+function MiniTimer({ time }: MiniTimerProps) {
+ return (
+
+ {time}
+
+ );
+}
+
+export default MiniTimer;
diff --git a/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
index 3807a8e0..a12ffa73 100644
--- a/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
+++ b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
@@ -1,4 +1,5 @@
import * as S from '../../components/GiftHomeDetail/GiftHomeDetail.styled';
+import MiniTimer from '../../components/common/MiniTimer/MiniTimer';
function GiftHomeDetail() {
const price = 42000;
@@ -8,9 +9,7 @@ function GiftHomeDetail() {
return (
{/* 공통 헤더 추가 예정 */}
-
- {time}
-
+
diff --git a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
index 8e595baa..c35a3a4c 100644
--- a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
+++ b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
@@ -1,4 +1,5 @@
import * as S from '../../components/GiftHomeDetail/GiftHomeDetail.styled';
+import MiniTimer from '../../components/common/MiniTimer/MiniTimer';
function GiftHomeDetail() {
const price = 42000;
@@ -9,9 +10,7 @@ function GiftHomeDetail() {
return (
{/* 공통 헤더 추가 예정 */}
-
- {time}
-
+
From 1f88a7e458349b79a4271974f8fad6e5388b21a8 Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 18:04:07 +0900
Subject: [PATCH 08/10] =?UTF-8?q?chore:=20=EB=B9=8C=EB=93=9C=20=EC=97=90?=
=?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/common/MiniTimer/MiniTimer.tsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/common/MiniTimer/MiniTimer.tsx b/src/components/common/MiniTimer/MiniTimer.tsx
index 1a7c027b..86786a4d 100644
--- a/src/components/common/MiniTimer/MiniTimer.tsx
+++ b/src/components/common/MiniTimer/MiniTimer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import * as S from './MiniTimer.styled';
interface MiniTimerProps {
From abf9b13e603e383086b77b165ca29ecf7bdd8263 Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 22:01:49 +0900
Subject: [PATCH 09/10] =?UTF-8?q?chore:=20=ED=8F=B4=EB=8D=94=EA=B5=AC?=
=?UTF-8?q?=EC=A1=B0=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/GiftAddPage/GiftAddPage.tsx | 7 +++++++
.../GiftHomeDetail/GiftHomeDetail.styled.ts | 0
src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx | 2 +-
src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 src/pages/GiftAddPage/GiftAddPage.tsx
rename src/{components => pages}/GiftHomeDetail/GiftHomeDetail.styled.ts (100%)
diff --git a/src/pages/GiftAddPage/GiftAddPage.tsx b/src/pages/GiftAddPage/GiftAddPage.tsx
new file mode 100644
index 00000000..cb664c9f
--- /dev/null
+++ b/src/pages/GiftAddPage/GiftAddPage.tsx
@@ -0,0 +1,7 @@
+import * as S from './GiftAddPage.styled';
+
+function GiftAddPage() {
+ return ;
+}
+
+export default GiftAddPage;
diff --git a/src/components/GiftHomeDetail/GiftHomeDetail.styled.ts b/src/pages/GiftHomeDetail/GiftHomeDetail.styled.ts
similarity index 100%
rename from src/components/GiftHomeDetail/GiftHomeDetail.styled.ts
rename to src/pages/GiftHomeDetail/GiftHomeDetail.styled.ts
diff --git a/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
index a12ffa73..d5842e6c 100644
--- a/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
+++ b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx
@@ -1,4 +1,4 @@
-import * as S from '../../components/GiftHomeDetail/GiftHomeDetail.styled';
+import * as S from './GiftHomeDetail.styled';
import MiniTimer from '../../components/common/MiniTimer/MiniTimer';
function GiftHomeDetail() {
diff --git a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
index c35a3a4c..bf2c71bf 100644
--- a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
+++ b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx
@@ -1,4 +1,4 @@
-import * as S from '../../components/GiftHomeDetail/GiftHomeDetail.styled';
+import * as S from './GiftHomeDetail.styled';
import MiniTimer from '../../components/common/MiniTimer/MiniTimer';
function GiftHomeDetail() {
From 03b5032a53a9f7b7f9beced48dc52abdab25df9b Mon Sep 17 00:00:00 2001
From: urjimyu <92876819+urjimyu@users.noreply.github.com>
Date: Tue, 9 Jan 2024 23:31:41 +0900
Subject: [PATCH 10/10] =?UTF-8?q?chore:=20=EB=B9=8C=EB=93=9C=20=EC=97=90?=
=?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/Router.tsx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/router/Router.tsx b/src/router/Router.tsx
index fffe860b..63feca2d 100644
--- a/src/router/Router.tsx
+++ b/src/router/Router.tsx
@@ -28,7 +28,8 @@ const router = createBrowserRouter([
// 임의로 세부페이지 추가
path: '/giftdetail2030',
element: ,
- },
+ },
+ {
path: '/onboarding',
element: ,
},