Skip to content

Commit

Permalink
Merge pull request codestates-seb#367 from nalsae/develop
Browse files Browse the repository at this point in the history
[FE] โœจ ๋ชจ๋“  ํŽ˜์ด์ง€์— ์•Œ๋ฆผ ๋ฒ„ํŠผ ์ถ”๊ฐ€
  • Loading branch information
nalsae authored Dec 26, 2023
2 parents c4c214e + 4f7abab commit bfdc2ec
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
2 changes: 2 additions & 0 deletions client/src/app/garden/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
LoadingNotice,
ShareButton,
ShareModal,
NotificationButton,
} from '@/components/common';
import {
GardenMap,
Expand Down Expand Up @@ -85,6 +86,7 @@ export default function Garden({ params }: GardenProps) {
)}
{isOpen && renderModal(type)}
</div>
<NotificationButton />
<InquiryButton />
<Footer />
</>
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/history/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
HistoryBox,
} from '@/components/history';
import { InquiryButton } from '@/components/inquiry';
import { Footer } from '@/components/common';
import { Footer, NotificationButton } from '@/components/common';

import { MOUNT_ANIMATION_VALUES } from '@/constants/values';

Expand Down Expand Up @@ -49,7 +49,7 @@ export default function History({ params }: HistoryProps) {
? createPortal(renderModal(type), portalElement)
: null}
</motion.div>

<NotificationButton />
<InquiryButton />
<Footer />
</>
Expand Down
17 changes: 10 additions & 7 deletions client/src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@

import { motion } from 'framer-motion';

import useClient from '@/hooks/useClient';
import useUserStore from '@/stores/userStore';

import Header from '@/components/common/Header';
import LoadingNotice from '@/components/common/LoadingNotice';
import Intro from '@/components/common/Intro';
import Footer from '@/components/common/Footer';
import useClient from '@/hooks/useClient';

import {
Header,
LoadingNotice,
Intro,
Footer,
NotificationButton,
} from '@/components/common';
import ServiceInfo from '@/components/main/ServiceInfo';
import MainSignupBanner from '@/components/main/MainSignupBanner';
import ScrollDownButton from '@/components/main/ScrollDownButton';
Expand Down Expand Up @@ -82,10 +86,9 @@ export default function Home() {
</div>
</motion.section>
)}

<NotificationButton />
<InquiryButton />
</div>

<Footer />
</>
)}
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/profile/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
FailureModal,
} from '@/components/history';
import { InquiryButton } from '@/components/inquiry';
import { Footer } from '@/components/common';
import { Footer, NotificationButton } from '@/components/common';

import { ADMIN_USER_ID, MOUNT_ANIMATION_VALUES } from '@/constants/values';

Expand Down Expand Up @@ -59,7 +59,7 @@ export default function Profile() {
? createPortal(renderModal(type), portalElement)
: null}
</motion.div>

<NotificationButton />
<InquiryButton />
<Footer />
</>
Expand Down

0 comments on commit bfdc2ec

Please sign in to comment.