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

릴리즈 브랜치 머지 #211

Merged
merged 6 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 components/Cakes/CakesForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/Cakes/CakesPay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion components/Common/Modal/ShareContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 2 additions & 0 deletions components/Mypage/EditWishes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ export default function EditWishesContainer() {
handlePutProgressWishes();
};

console.log(progressData);

return (
<>
<Styled.TitleWrapper>
Expand Down
1 change: 1 addition & 0 deletions components/Mypage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
1 change: 1 addition & 0 deletions components/Wishes/WishesForm/WishesStep1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion components/footer.tsx
Original file line number Diff line number Diff line change
@@ -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 = () => {
Expand Down
1 change: 1 addition & 0 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading