Skip to content

Commit

Permalink
Merge pull request #202 from Make-A-Wish-Sopt/revert-201-hotfix/200-f…
Browse files Browse the repository at this point in the history
…ooterLink

Revert "Hotfix/200 footer link"
  • Loading branch information
myeongheonhong authored Feb 14, 2024
2 parents e4d639f + d14fa5f commit d947be5
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 2 deletions.
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: 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

0 comments on commit d947be5

Please sign in to comment.