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.

Sign up for GitHub

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

Jump to bottom

주말 아침부터 보라빛 향기 #434

Merged
merged 4 commits into from
Sep 23, 2023
Merged

주말 아침부터 보라빛 향기 #434

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33002c5
chore: @sopt-makers/playground-common 버전올리기
na-reum Sep 22, 2023
d34f329
feat: 토글버튼 보라색 걷어내기
na-reum Sep 22, 2023
70449c7
feat: 피드 모달 임시버튼 삭제
na-reum Sep 22, 2023
be21537
feat: 헤더 버전업
na-reum Sep 23, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@hookform/resolvers": "^2.9.10",
"@sentry/nextjs": "^7.51.0",
"@sopt-makers/colors": "^1.0.0",
"@sopt-makers/playground-common": "^1.2.0",
"@sopt-makers/playground-common": "^1.2.1",
"@stitches/react": "^1.2.8",
"@tanstack/react-query": "^4.10.3",
"axios": "^1.1.3",
Expand Down
34 changes: 0 additions & 34 deletions pages/detail/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ import FeedPanel from '@components/page/meetingDetail/Feed/FeedPanel';
import { Fragment, useState } from 'react';
import dayjs from 'dayjs';
import 'dayjs/locale/ko';
import { useOverlay } from '@hooks/useOverlay/Index';
import FeedCreateModal from '@components/page/meetingDetail/Feed/Modal/FeedCreateModal';
import ConfirmModal from '@components/modal/ConfirmModal';

dayjs.locale('ko');

Expand All @@ -29,33 +26,6 @@ const DetailPage = () => {
const { data: detailData } = useQueryGetMeeting({ params: { id } });
const { mutate: mutateDeleteMeeting } = useMutationDeleteMeeting({});
const { mutate: mutatePostApplication } = useMutationPostApplication({});
const createFeedOverlay = useOverlay();
const closeCreateFeedOverlay = useOverlay();

const handleCreateFeedOpen = () =>
createFeedOverlay.open(({ isOpen: isCreateModalOpen, close: closeCreateModal }) => (
<FeedCreateModal
isModalOpened={isCreateModalOpen}
handleModalExit={() => {
closeCreateModal();
}}
handleModalClose={() => {
closeCreateFeedOverlay.open(({ isOpen: isConfirmModalOpen, close: closeConfirmModal }) => (
<ConfirmModal
isModalOpened={isConfirmModalOpen}
message={`피드 작성을 그만두시겠어요?\n지금까지 쓴 내용이 지워져요.`}
handleModalClose={closeConfirmModal}
cancelButton="돌아가기"
confirmButton="그만두기"
handleConfirm={() => {
closeConfirmModal();
closeCreateModal();
}}
/>
));
}}
/>
));

if (!detailData) {
return <Loader />;
Expand All @@ -65,10 +35,6 @@ const DetailPage = () => {
<>
<SDetailPage>
<Carousel imageList={detailData?.imageURL} />
<button style={{ color: 'white' }} onClick={handleCreateFeedOpen}>
모달 오픈
</button>

<DetailHeader
detailData={detailData}
mutateMeetingDeletion={mutateDeleteMeeting}
Expand Down
2 changes: 1 addition & 1 deletion src/components/button/Switch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const SSwitch = styled('button', {
variants: {
checked: {
true: {
backgroundColor: '$gray100',
backgroundColor: '$blue50',
'& > div': {
transform: 'translate3d(12px,0,0)',
},
Expand Down
Loading