diff --git a/.github/workflows/main-deploy.yml b/.github/workflows/main-deploy.yml index 7b6452000..4e5685cb6 100644 --- a/.github/workflows/main-deploy.yml +++ b/.github/workflows/main-deploy.yml @@ -20,6 +20,7 @@ jobs: - name: Build env: NEXT_PUBLIC_SERVER_ENDPOINT: ${{ secrets.NEXT_PUBLIC_SERVER_ENDPOINT }} + NEXT_PUBLIC_AGENDA_SERVER_ENDPOINT: ${{ secrets.NEXT_PUBLIC_AGENDA_SERVER_ENDPOINT }} NEXT_PUBLIC_CLIENT_ENDPOINT: ${{ secrets.NEXT_PUBLIC_CLIENT_ENDPOINT }} NEXT_PUBLIC_MANAGE_SERVER_ENDPOINT: ${{ secrets.NEXT_PUBLIC_MANAGE_SERVER_ENDPOINT }} NEXT_PUBLIC_PARTY_MANAGE_SERVER_ENDPOINT: ${{ secrets.NEXT_PUBLIC_PARTY_MANAGE_SERVER_ENDPOINT }} diff --git a/components/agenda/Home/AgendaInfo.tsx b/components/agenda/Home/AgendaInfo.tsx index c560fed75..b21000e5d 100644 --- a/components/agenda/Home/AgendaInfo.tsx +++ b/components/agenda/Home/AgendaInfo.tsx @@ -3,6 +3,7 @@ import { AgendaDataProps } from 'types/agenda/agendaDetail/agendaTypes'; import { showPeriod } from 'utils/handleTime'; import AgendaTags from 'components/agenda/utils/AgendaTags'; import StartDate from 'components/agenda/utils/StartDate'; +import RightArrow from 'public/image/agenda/ChevronRight.svg'; import styles from 'styles/agenda/Home/AgendaInfo.module.scss'; // Props: API data @@ -14,7 +15,15 @@ const AgendaInfo = ({ idx: number; }) => { if (!agendaInfo) { - return
There is no agenda
; + return ( +
+
현재 모집 중인 행사가 없습니다.
+
+
Agenda 페이지 이동
+ +
+
+ ); } const startDate = new Date(agendaInfo.agendaStartTime); const endDate = new Date(agendaInfo.agendaEndTime); diff --git a/components/agenda/Home/AgendaTitle.tsx b/components/agenda/Home/AgendaTitle.tsx index 0e8b1a628..ccda6f444 100644 --- a/components/agenda/Home/AgendaTitle.tsx +++ b/components/agenda/Home/AgendaTitle.tsx @@ -7,7 +7,7 @@ const AgendaTitle = () => { return ( <>
-
AGENDA
+
Agenda
)) ) : ( -
참여중 아젠다가 없습니다.
+
+ 아젠다 목록이 비어있습니다. 새로운 아젠다를 시작해보세요! +
)}
); diff --git a/components/agenda/Profile/HistoryList.tsx b/components/agenda/Profile/HistoryList.tsx index e9110f459..e21053293 100644 --- a/components/agenda/Profile/HistoryList.tsx +++ b/components/agenda/Profile/HistoryList.tsx @@ -110,7 +110,9 @@ const HistoryList = ({ historyListData }: HistoryListProps) => { } ) ) : ( -
아젠다 기록이 없습니다.
+
+ 아젠다 기록이 없습니다. 새로운 아젠다를 시작해보세요! +
)} diff --git a/components/agenda/Profile/ProfileCard.tsx b/components/agenda/Profile/ProfileCard.tsx index 1d4ed497a..59a8d1f0d 100644 --- a/components/agenda/Profile/ProfileCard.tsx +++ b/components/agenda/Profile/ProfileCard.tsx @@ -217,7 +217,12 @@ const ProfileCard = ({ key={index} className={styles.acheivementImageWrapper} > - + ); } diff --git a/components/agenda/Ticket/Ticket.tsx b/components/agenda/Ticket/Ticket.tsx index 6adefd82a..b79e39918 100644 --- a/components/agenda/Ticket/Ticket.tsx +++ b/components/agenda/Ticket/Ticket.tsx @@ -11,7 +11,7 @@ interface TicketProps { const Ticket = ({ type }: { type: string }) => { const { data } = useFetchGet({ url: '/ticket' }); const { openModal } = useModal(); - console.log(data); + return ( <> {type === 'page' ? ( diff --git a/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx b/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx index 585db8bc9..0c130e0dc 100644 --- a/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx +++ b/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx @@ -17,6 +17,10 @@ export default function AgendaAnnouncements() { size: 5, isReady: Boolean(agendaKey), }); + const newHandler = (page: number) => { + setSelected(0); + return PagaNationElementProps.pageChangeHandler(page); + }; if (!agendaKey || !content) { return ( @@ -41,16 +45,23 @@ export default function AgendaAnnouncements() { setSelected={() => setSelected(idx)} /> ))} - + - + {content[selected] ? ( + + ) : ( + '' + )} ) : (
공지사항이 없습니다.
diff --git a/components/agenda/agendaDetail/tabs/AgendaDescription.tsx b/components/agenda/agendaDetail/tabs/AgendaDescription.tsx index fc7bf383f..72db01c78 100644 --- a/components/agenda/agendaDetail/tabs/AgendaDescription.tsx +++ b/components/agenda/agendaDetail/tabs/AgendaDescription.tsx @@ -37,7 +37,7 @@ export default function AgendaDescription({ agendaData }: AgendaProps) {

대회 설명

- {agendaContent} + {agendaContent}

모집 완료 기간

diff --git a/components/agenda/utils/CustomImage.tsx b/components/agenda/utils/CustomImage.tsx index cc43ff197..87ae26f23 100644 --- a/components/agenda/utils/CustomImage.tsx +++ b/components/agenda/utils/CustomImage.tsx @@ -1,6 +1,6 @@ import Image from 'next/image'; import classNames from 'classnames'; -import { useState } from 'react'; +import { MouseEvent, useState } from 'react'; import { CustomImageProps } from 'types/agenda/utils/customImageTypes'; import styles from 'styles/agenda/utils/CustomImage.module.scss'; @@ -10,8 +10,12 @@ const CustomImage = ({ alt, addClass, isProfileImage, + name, + description, }: CustomImageProps) => { const [imgSrc, setImgSrc] = useState(src); + const [isHovered, setIsHovered] = useState(false); + const [mousePosition, setMousePosition] = useState({ x: 0, y: 0 }); const handleError = () => { isProfileImage @@ -19,17 +23,41 @@ const CustomImage = ({ : setImgSrc('/image/agenda/42-icon.svg'); }; + const handleMouseEnter = (e: MouseEvent) => { + setIsHovered(true); + setMousePosition({ + x: e.clientX, + y: e.clientY, + }); + }; + + const handleMouseLeave = () => { + setIsHovered(false); + }; + return src ? ( - {alt} +
+ {alt} + {isHovered && ( +
+
{name}
+
{description}
+
+ )} +
) : null; }; diff --git a/components/agenda/utils/PageController.tsx b/components/agenda/utils/PageController.tsx index 1f5f485f2..9b9f62365 100644 --- a/components/agenda/utils/PageController.tsx +++ b/components/agenda/utils/PageController.tsx @@ -99,7 +99,7 @@ const PageController = ({ ? handleNavigation( '/agenda/detail?agenda_key=' + data[current].agendaKey ) - : null; + : handleNavigation('/agenda'); }} className={styles.toClick} /> diff --git a/pages/agenda/index.tsx b/pages/agenda/index.tsx index 393b0e712..113e1ebe8 100644 --- a/pages/agenda/index.tsx +++ b/pages/agenda/index.tsx @@ -29,7 +29,7 @@ const Agenda: NextPage = () => {
-

AGENDA LIST

+

AGENDA LIST

- {' | '} + {'|'} - {' | '} + {'|'} + {isMyProfile.current ? ( + + ) : null}

- {/* Host Current List */} - {activeTab === 'hostCurrent' && - hostCurrentListData && - hostCurrentListData.length > 0 ? ( - <> - - - - ) : activeTab === 'hostCurrent' ? ( - '' - ) : null} - - {/* Current List */} + {/* Current List - 참여중 */} {activeTab === 'current' && isMyProfile.current && currentListData ? ( <> - ) : activeTab === 'current' ? ( - '' ) : null} - {/* History Host List */} - {activeTab === 'hostHistory' && - hostHistoryListData && - hostHistoryListData.length > 0 ? ( + {/* Host Current List - 개최중 */} + {activeTab === 'hostCurrent' && hostCurrentListData ? ( <> - {' '} - + + - ) : activeTab === 'hostHistory' ? ( - '' ) : null} - {/* History List */} + {/* History List - 참여 기록 */} {activeTab === 'history' && historyListData ? ( <> {' '} - ) : activeTab === 'history' ? ( - '' + ) : null} + + {/* History Host List - 개최 기록 */} + {activeTab === 'hostHistory' && hostHistoryListData ? ( + <> + {' '} + + ) : null}
diff --git a/pages/index.tsx b/pages/index.tsx index 5932e6eb2..f2638220b 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -24,7 +24,12 @@ const Index: NextPage = () => {
-

Ticket

+

handleNavigation('/agenda/ticket')} + > + Ticket +