From 49d4ba64d56b20524fed1e8615f6a59382a5e69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=84=EC=A7=84=ED=98=B8?= Date: Mon, 19 Feb 2024 21:35:48 +0900 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 6dd66e493163fc7b49c05396ca6c2bead235c6cc Author: 전진호 Date: Mon Feb 19 21:34:07 2024 +0900 fix: remove duplicated identifier commit 5ec1eb54a5a0532e221858aef895a807465aed21 Merge: b1350d9 4ed3857 Author: Jeon Jinho Date: Mon Feb 19 21:28:53 2024 +0900 Merge branch 'main' into dev commit b1350d97d974585f9b3cc09ae134336bcd0f6d4f Author: Jeon Jinho Date: Mon Feb 19 16:11:17 2024 +0900 comment에 choice 추가해서 선택지 반영 (#222) commit 093fdbfb9bd5b879b602a7864c5465c7651be877 Author: Jeon Jinho Date: Mon Feb 19 16:11:05 2024 +0900 알림 화면에 뒤로가기 버튼 추가 (#220) commit 581907a5f07954e2ed9658b815e9474ed865ce21 Author: Jeon Jinho Date: Mon Feb 19 16:09:47 2024 +0900 fix: 유저가 작성한 토픽인 경우 조회 가능하도록 수정 (#219) * fix: get method to throw error * fix: check if member created topic * fiX: remove console.log * refactor: remove another console.logs commit 7664e484d654971043919973311f94a3e8aed8ce Author: Jeon Jinho Date: Mon Feb 19 16:09:35 2024 +0900 A 사이드 토픽 카드 텍스트 영역 및 소수점 이슈 해결 (#218) * fix: round percentage * fix: make progress content hidden with ellipsis * fix: integrate to topic * fix: show toast on vote my topic commit 112de6d2a68f83a89c3434f8f8e32a9ef46da00f Author: Jeon Jinho Date: Mon Feb 19 13:59:24 2024 +0900 fix: 토픽 작성자는 투표 불가 (#217) * chore: add react-toastify * feat: add zIndex type to theme * feat: Toast container * feat: show toast and reset slide * fix: make handleVote return Promise commit d101c4765baccd8f7139f973ca820b4d430f3e98 Merge: ef9eaee 0292560 Author: CHAEYOUNG SONG <77428876+chaeyoung103@users.noreply.github.com> Date: Mon Feb 19 00:14:32 2024 +0900 Merge pull request #215 from team-offonoff/feat/admin-login fix: admin login button commit 029256082f3511fd2eacc4ddf1aee177f8cc9c0a Author: 전진호 Date: Mon Feb 19 00:10:32 2024 +0900 feat: add admin login button commit adf85b84c95f0b1c45e156340e3d5a1399fe5b93 Author: 전진호 Date: Sun Feb 18 23:41:07 2024 +0900 feat: replace to useOAuth commit 1fade9e5fe071db595fb6426b31a5070707df589 Author: 전진호 Date: Sun Feb 18 23:40:53 2024 +0900 fix: redirect user to login page on fail commit 196a01136bfe5cb2be06e935ce8dda9b2adde2d9 Author: 전진호 Date: Sun Feb 18 23:38:36 2024 +0900 feat: add useOAuth to authroize commonly commit 5b207286050db8ea242c2f49d714c37186a95726 Author: 전진호 Date: Sun Feb 18 23:38:08 2024 +0900 fix: separate login url retrieve to function commit ef9eaee772ec4db7dcf992557aa5359dcefe13ad Author: Jeon Jinho Date: Sat Feb 17 21:10:24 2024 +0900 fix: signup 화면 디자인 불일치 수정 (#213) * fix: make DefaultButton extends ButtonHTMLAttributes * feat: replace to DefaultButton * fix: radio button selected style * feat: navigate to home after consent to term commit 89f4201056a889fa86316098dda67c068b93da4f Author: 전진호 Date: Sat Feb 17 20:58:26 2024 +0900 fix: google redirect url commit ca79bec83ede2dcef8c52d06ae53775345193b61 Author: Jeon Jinho Date: Thu Feb 15 15:29:05 2024 +0900 Theme Color를 Layout에서 동적으로 수정 (#210) * chore: add react-helmet * feat: change theme color in layout commit 03d663e7d7ed66540a05b38c10422a96e2a4274c Merge: 370b532 25634ba Author: Jeon Jinho Date: Wed Feb 14 20:06:01 2024 +0900 Merge pull request #205 from team-offonoff/feat/mypage 마이페이지 ui 및 기능 추가 commit 25634baca32391c3035b618a2a4abb48ba921835 Merge: b4efd5b 370b532 Author: Jeon Jinho Date: Wed Feb 14 20:05:42 2024 +0900 Merge branch 'dev' into feat/mypage commit b4efd5b9d922f23ede8f50692b88701ee49e46b6 Author: chaeyoung103 Date: Wed Feb 14 20:01:52 2024 +0900 feat: 프로필 이미지 삭제하기 기능추가 delete api 연동 및 삭제하기 모달 추가 commit ecff063100dd9c6b42e1a7a524dea7f8484d1c61 Author: chaeyoung103 Date: Wed Feb 14 20:01:12 2024 +0900 fix: 삭제하기 액션모달 사용을 위한 수정 commit 370b532f4a121fc73c65976bec3901559667dcb5 Merge: 360a128 da57fb0 Author: Jeon Jinho Date: Wed Feb 14 19:44:54 2024 +0900 Merge pull request #203 from team-offonoff/feat/sentry-logging feat: add @sentry/react commit 360a1287ac2077d40422faf324f66871596c562b Merge: d7e66db 3a3c64c Author: Jeon Jinho Date: Wed Feb 14 19:44:42 2024 +0900 Merge pull request #202 from team-offonoff/feat/b-side-detail-page B 사이드 상세 페이지 구현 commit da57fb081e1e03d0f70c04bff11813fa23fb1bb1 Author: 전진호 Date: Wed Feb 14 19:37:34 2024 +0900 feat: thrwo Error for testing commit de3c598f9e6bbaa9dc311dfb99c2a37910f09c8c Author: 전진호 Date: Wed Feb 14 19:37:19 2024 +0900 feat: init sentry commit 5fbe1d651de7f5fa34a234635b13d155395acfb7 Author: 전진호 Date: Wed Feb 14 19:37:12 2024 +0900 feat: add @sentry/react commit 3a3c64c378f43cb8dd5d6e83c48b3c26c236fe05 Author: 전진호 Date: Wed Feb 14 19:29:44 2024 +0900 feat: navigate to detail page on click card commit 85379ef29f7a6b27e97681894f9d5c3b62413fb1 Author: 전진호 Date: Wed Feb 14 19:29:16 2024 +0900 feat: add B side detail page commit dd5380fef7ed3dbb8a67a1e4a72ec1a459da4811 Author: 전진호 Date: Wed Feb 14 19:27:57 2024 +0900 fix: make choiceSlide box-sizing to content-box commit 7fc29602384c2f7cfd76cc9186c648a1e35688ad Author: 전진호 Date: Wed Feb 14 19:27:34 2024 +0900 feat: add BackButton component commit ce9ae7880e81385d954b573102d40359b2e0a6e6 Author: 전진호 Date: Wed Feb 14 18:41:15 2024 +0900 feat: separate loading component commit d7e66dbf1b833d987fb8a46c86b9dcda7a3c8b0e Merge: e5d10fa 88040c3 Author: Jeon Jinho Date: Wed Feb 14 18:36:34 2024 +0900 Merge pull request #201 from team-offonoff/feat/loading-screen Loading 화면 분리 commit 90fc26b1c9beba8e997ff4ed2e46e944ca0d4a80 Author: chaeyoung103 Date: Wed Feb 14 16:13:58 2024 +0900 feat: 프로필 이미지 s3 업로드 및 프로필 이미지 변경 api 연동 commit 88040c30cf9311a8c0b374db8597355b6a862267 Author: 전진호 Date: Wed Feb 14 15:50:49 2024 +0900 feat: separate loading component commit e5d10faaa212a8d5b077fa912af30e4942b48075 Author: 전진호 Date: Wed Feb 14 15:16:35 2024 +0900 fix: routes missing commit 564d19c45a1550369297255f8d77c21a301277eb Merge: 5ff3a6e 22d7eb1 Author: Jeon Jinho Date: Wed Feb 14 15:15:14 2024 +0900 Merge pull request #199 from team-offonoff/feat/lazy-routes feat: load routes lazily commit 22d7eb165558756e56438515be09a7a77e1bf5dc Merge: b01f5a7 5ff3a6e Author: Jeon Jinho Date: Wed Feb 14 15:14:43 2024 +0900 Merge branch 'dev' into feat/lazy-routes commit 5ff3a6e72b2d047ba11d364764b2a81ebaa62ed1 Merge: 4f28590 566d213 Author: Jeon Jinho Date: Wed Feb 14 15:14:10 2024 +0900 Merge pull request #198 from team-offonoff/feat/b-side-page feat: B 사이드 토픽 홈 화면 구현 commit b01f5a71c2eb36cc509b8907e931bc21ad74e259 Author: 전진호 Date: Tue Feb 13 22:30:19 2024 +0900 feat: load routes lazily commit 566d213cdeaadd8c690b4ebccbac5a8af7d5dcc8 Author: 전진호 Date: Tue Feb 13 22:08:37 2024 +0900 fix: render BTopicCard commit ed0f863795e0bfaeb81da2c4331937763a2ecb33 Author: 전진호 Date: Tue Feb 13 21:58:44 2024 +0900 feat: implements BTopicCard commit 853df2a188eb4944492dbff5daa57142e23d01b9 Author: 전진호 Date: Tue Feb 13 21:58:21 2024 +0900 feat: implements BTopicChoice commit c1b28ef46cab25c3cda36483e7a92b4f8d37c927 Author: 전진호 Date: Tue Feb 13 21:54:23 2024 +0900 feat: add backgroundColor as optional commit 54875a5285f7e245f768e4f70b8dad3d0299887d Author: 전진호 Date: Tue Feb 13 20:08:58 2024 +0900 fix: remove transition from body commit 4ef34b5741457d7d78c36e894fa50ad96de2cf39 Author: 전진호 Date: Tue Feb 13 19:59:11 2024 +0900 fix: separate onVote commit 2c0c540b77015520f082b70de470f854ebfc4223 Author: 전진호 Date: Tue Feb 13 17:49:04 2024 +0900 feat: add b topics background color commit 3977e6d2215e7891d6d97c37c0f3eefe657c504a Author: 전진호 Date: Tue Feb 13 17:48:27 2024 +0900 fix: b nav item to commit 67bd61215d5f5e3bd1c4c0faaae8a5f9b557472b Author: 전진호 Date: Tue Feb 13 17:14:37 2024 +0900 feat: rename ATopics and add BTopics commit d0bec2056b4edd56a29aafeb15a298717f5ac1ab Merge: 72aaca6 4f28590 Author: chaeyoung103 Date: Tue Feb 13 16:34:58 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage commit 72aaca6dba2f387f8cb5763250056941a0ec9272 Author: chaeyoung103 Date: Mon Feb 12 20:26:12 2024 +0900 feat: mypage 모달 생성, 앨범 기능 추가 commit 19361872fe70fdd39f107535c73a43c253d812d8 Merge: 629e617 413afd3 Author: chaeyoung103 Date: Mon Feb 12 17:44:21 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage commit 629e61710e67733299fcd1ed881dc86249e1be07 Merge: 55d5c17 b77acf8 Author: chaeyoung103 Date: Fri Feb 9 22:46:07 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage commit 55d5c17dcf9151805771e998956757d695b23102 Merge: f5be359 55e8442 Author: chaeyoung103 Date: Fri Feb 9 22:38:11 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage commit f5be359dd8f966d9846129ae64c8d28020877692 Merge: 39fc1c1 3a24467 Author: chaeyoung103 Date: Fri Feb 9 20:56:42 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage commit 39fc1c1e52ea4aa5ccc8e2646c58ae86af0e6487 Author: chaeyoung103 Date: Fri Feb 9 17:57:44 2024 +0900 feat: mypage ui 생성 commit 682c926244b3b3fedfc90988be95b6e807edb486 Merge: 7e36b4e da45f52 Author: chaeyoung103 Date: Fri Feb 9 16:18:26 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage commit 7e36b4e87757dcf0ce970a046a26cf5e8dc3aab6 Merge: b532fb5 2624766 Author: chaeyoung103 Date: Thu Feb 8 21:53:48 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage commit b532fb53943e02920b87384e8794339d61751c83 Merge: 185fc29 0d1fdb5 Author: chaeyoung103 Date: Thu Feb 8 21:32:20 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage commit 185fc291082d5ad9398a730f63c128ee37ea2eda Merge: d892fd5 2232cb4 Author: chaeyoung103 Date: Thu Feb 8 21:29:12 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage commit d892fd5fdc6e2241d9748cfcb003f4adf88acb59 Merge: ac72441 8c74cf2 Author: chaeyoung103 Date: Thu Feb 8 21:26:21 2024 +0900 Merge remote-tracking branch 'origin/dev' into feat/mypage --- src/components/A/ATopicCard.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/A/ATopicCard.tsx b/src/components/A/ATopicCard.tsx index 8251173..804a58c 100644 --- a/src/components/A/ATopicCard.tsx +++ b/src/components/A/ATopicCard.tsx @@ -18,7 +18,6 @@ interface AlphaTopicCardProps { topic: TopicResponse; onVote: (topicId: number, side: 'CHOICE_A' | 'CHOICE_B') => void; chip?: 'popular' | 'close'; - onVote: (topicId: number, side: 'CHOICE_A' | 'CHOICE_B') => void; } const AlphaTopicCard = React.memo(({ topic, onVote, chip }: AlphaTopicCardProps) => {