From d14fa5f7ece883e0a8bd303966984176c15abaca Mon Sep 17 00:00:00 2001 From: _hongmh <70846061+myeongheonhong@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:24:16 +0900 Subject: [PATCH 1/2] Revert "Hotfix/200 footer link" --- components/Cakes/CakesForm.tsx | 1 + components/Cakes/CakesPay.tsx | 2 +- components/Mypage/EditWishes/index.tsx | 2 ++ components/Mypage/index.tsx | 1 + components/Wishes/WishesForm/WishesStep1.tsx | 1 + components/footer.tsx | 4 +++- pages/_app.tsx | 1 + 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/Cakes/CakesForm.tsx b/components/Cakes/CakesForm.tsx index a9f2fe9c..0d08cc59 100644 --- a/components/Cakes/CakesForm.tsx +++ b/components/Cakes/CakesForm.tsx @@ -11,6 +11,7 @@ import { StyledBox } from '../Common/Box'; import BackBtn from '../Common/Button/BackBtn'; import { CakeListType } from '@/types/cakes/cakeListType'; import { useGetPublicWishes } from '@/hooks/queries/public'; +import { UseMutateFunction } from 'react-query'; import theme from '@/styles/theme'; import { useEffect, useState } from 'react'; diff --git a/components/Cakes/CakesPay.tsx b/components/Cakes/CakesPay.tsx index 3849b488..3a145191 100644 --- a/components/Cakes/CakesPay.tsx +++ b/components/Cakes/CakesPay.tsx @@ -37,7 +37,7 @@ interface CakesPayProps { } export default function CakesPay(props: CakesPayProps) { - const { handlePrevStep, selectedCake, wishesId, postPublicCakesData } = props; + const { handlePrevStep, handleNextStep, selectedCake, wishesId, postPublicCakesData } = props; const { publicWishesData } = useGetPublicWishes(wishesId); diff --git a/components/Mypage/EditWishes/index.tsx b/components/Mypage/EditWishes/index.tsx index 4c6f04b3..fdc1e934 100644 --- a/components/Mypage/EditWishes/index.tsx +++ b/components/Mypage/EditWishes/index.tsx @@ -102,6 +102,8 @@ export default function EditWishesContainer() { handlePutProgressWishes(); }; + console.log(progressData); + return ( <> diff --git a/components/Mypage/index.tsx b/components/Mypage/index.tsx index 26a04497..d9e74314 100644 --- a/components/Mypage/index.tsx +++ b/components/Mypage/index.tsx @@ -10,6 +10,7 @@ import Modal from '@/components/Common/Modal'; import useModal from '@/hooks/common/useModal'; import { MypageCakeImg } from '@/public/assets/images'; import { useEffect, useState } from 'react'; +import { deleteUserInfo } from '@/api/user'; import { useGetMainProgressData, usePatchProgressWishes } from '@/hooks/queries/wishes'; import CancleWishesModal from '../Common/Modal/CancelWishesModal'; diff --git a/components/Wishes/WishesForm/WishesStep1.tsx b/components/Wishes/WishesForm/WishesStep1.tsx index 225e7680..44f83a28 100644 --- a/components/Wishes/WishesForm/WishesStep1.tsx +++ b/components/Wishes/WishesForm/WishesStep1.tsx @@ -3,6 +3,7 @@ import ItemLink from './ItemLink'; import { LIMIT_TEXT } from '@/constant/limitText'; import { ChangeEvent, PropsWithChildren, useEffect, useState } from 'react'; import styled from 'styled-components'; +import UploadTypeToggleBtn from '@/components/Common/UploadTypeToggleBtn'; import { WishesDataInputType } from '@/types/wishesType'; import { UseFormReturn } from 'react-hook-form'; import Input from '@/components/Common/Input/Input'; diff --git a/components/footer.tsx b/components/footer.tsx index bbe497b2..25206930 100644 --- a/components/footer.tsx +++ b/components/footer.tsx @@ -1,9 +1,11 @@ +import { LogoImg } from '@/public/assets/images'; import theme from '@/styles/theme'; import styled from 'styled-components'; +import Image from 'next/image'; export default function Footer() { const handleTermsOfUse = () => { - window.open('https://hwajeonglee.notion.site/080d632659a94e1b9131567947f679a3'); + window.open('https://mercurial-fuschia-8f2.notion.site/7e827f42eecb46f382ac46cf183245d3'); }; const handlePrivacyPolicy = () => { diff --git a/pages/_app.tsx b/pages/_app.tsx index e3ba5f5b..8179408f 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -9,6 +9,7 @@ import theme from '@/styles/theme'; import { useEffect } from 'react'; import Script from 'next/script'; import Loading from '@/components/Common/Loading/Loading'; +import Footer from '@/components/footer'; declare global { interface Window { From 4770eff1f8f2e143d0281024e2a5a86483ee1f11 Mon Sep 17 00:00:00 2001 From: myeongheonhong Date: Wed, 7 Aug 2024 17:15:04 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[=20feat=20]=20=EB=8F=84=EB=A9=94=EC=9D=B8?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Common/Modal/ShareContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Common/Modal/ShareContent.tsx b/components/Common/Modal/ShareContent.tsx index 39167d92..a36897f4 100644 --- a/components/Common/Modal/ShareContent.tsx +++ b/components/Common/Modal/ShareContent.tsx @@ -18,7 +18,7 @@ export default function ShareContent() { const { progressData } = useGetMainProgressData(); useEffect(() => { - progressData && setWishesLink(`https://sunmulzu.store/wishes/${progressData.wishId}`); + progressData && setWishesLink(`https://sunmulzu.com/wishes/${progressData.wishId}`); }, []); const handleShareSNS = (name: string) => {