-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ )}
+ {/* ------------------------------------- */}
+ setPartyOpen(!isPartyOpen)}
+ onClick={() => setTakguOpen(!isTakguOpen)}
>
-
- {isPartyOpen && (
+ {isTakguOpen && (
-
-
-
-
-
+ setPartyOpen(!isPartyOpen)}
>
-
-
-
-
+
+
+ {isPartyOpen && (
+
+
+ )}
+ setAgendaOpen(!isAgendaOpen)}
+ >
+
-
+
)}
diff --git a/components/admin/SideNavContent.tsx b/components/admin/SideNavContent.tsx
index ea6c80358..75b5e5d41 100644
--- a/components/admin/SideNavContent.tsx
+++ b/components/admin/SideNavContent.tsx
@@ -2,6 +2,7 @@ import Link from 'next/link';
import styles from 'styles/admin/SideNavContent.module.scss';
type SideNavContentProps = {
+ type: string;
url: string;
menuName: string;
currentPath: string;
@@ -9,13 +10,14 @@ type SideNavContentProps = {
};
export default function SideNavContent({
+ type,
url,
menuName,
currentPath,
children,
}: SideNavContentProps) {
return (
-
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/components/admin/agenda/agendaList/AgendaFillterTab.tsx b/components/admin/agenda/agendaList/AgendaFillterTab.tsx
new file mode 100644
index 000000000..61e792a87
--- /dev/null
+++ b/components/admin/agenda/agendaList/AgendaFillterTab.tsx
@@ -0,0 +1,63 @@
+import { useEffect, useState } from 'react';
+import { AgendaStatus } from 'constants/agenda/agenda';
+import styles from 'styles/admin/takgu/usageHistory/MenuTab.module.scss';
+import AgendaTable from './AgendaTable';
+
+export default function AgendaFillterTab() {
+ const [tabIdx, setTabIdx] = useState(0);
+ const [child, setChild] = useState(({
+ agendaList: [],
+ totalPage: 1,
+ currentPage: 1,
+ });
+
+ const [currentPage, setCurrentPage] = useState(1);
+ const { openModal, closeModal } = useModal();
+
+ const buttonList: string[] = [
+ styles.delete,
+ styles.default,
+ styles.detail,
+ styles.coin,
+ styles.penalty,
+ ];
+
+ const deleteAgenda = async (agenda: any) => {
+ const agendaKey = agenda.agendaKey;
+
+ const formatDate = (date: string) => {
+ return date.replace(' ', 'T') + ':00';
+ };
+
+ const updatedAgenda = {
+ ...agenda,
+ agendaStartTime: formatDate(agenda.agendaStartTime),
+ agendaEndTime: formatDate(agenda.agendaEndTime),
+ agendaDeadLine: formatDate(agenda.agendaDeadLine),
+ agendaStatus: 'CANCEL',
+ agendaPoster: null,
+ };
+
+ const formData = new FormData();
+ Object.keys(updatedAgenda).forEach((key) => {
+ formData.append(key, updatedAgenda[key]);
+ });
+
+ await sendRequest(
+ 'POST',
+ `admin/request`,
+ formData,
+ { agenda_key: agendaKey },
+ (data) => {
+ alert('취소 요청이 성공적으로 전송되었습니다.');
+ getAgendaList();
+ },
+ (error) => {
+ alert('취소 요청에 실패했습니다: ' + error);
+ }
+ );
+ };
+
+ const handleButtonAction = (buttonName: string, agenda: any) => {
+ const agendaKey = agenda.agendaKey;
+ switch (buttonName) {
+ case '자세히':
+ openModal({
+ type: 'modify',
+ title: '대회 상세정보',
+ description: '변경 후 수정 버튼을 눌러주세요.',
+ FormComponent: ModifyAgendaForm,
+ data: agenda,
+ isAdmin: true,
+ stringKey: agendaKey,
+ onProceed: () => {
+ closeModal();
+ getAgendaList();
+ },
+ });
+ break;
+ case '취소':
+ deleteAgenda(agenda);
+ break;
+ case '팀 목록':
+ router.push(`/admin/agenda/teamList?agendaKey=${agendaKey}`);
+ break;
+ case '공지사항':
+ router.push(`/admin/agenda/announcements?agendaKey=${agendaKey}`);
+ break;
+ case '포스터':
+ if (!agenda.agendaPosterUrl) {
+ alert('포스터가 없습니다.');
+ return;
+ }
+ openModal({
+ type: 'notice',
+ title: '포스터',
+ description: "포스터 수정은 '자세히' 버튼을 눌러주세요.",
+ image: agenda.agendaPosterUrl,
+ });
+ break;
+ }
+ };
+
+ const getAgendaList = useCallback(async () => {
+ try {
+ const getData = await instanceInAgenda.get(
+ `/admin/request/list?page=${currentPage}&size=${itemsPerPage}`
+ );
+
+ const filteredAgendaList = getData.data.content.filter(
+ (agenda: IAgenda) => {
+ const matchesStatus = status ? agenda.agendaStatus === status : true;
+ const matchesOfficial =
+ isOfficial !== undefined ? agenda.isOfficial === isOfficial : true;
+ return matchesStatus && matchesOfficial;
+ }
+ );
+
+ setAgendaInfo({
+ agendaList: filteredAgendaList.map((agenda: IAgenda) => {
+ return {
+ ...agenda,
+ agendaDeadLine: dateToString(new Date(agenda.agendaDeadLine)),
+ agendaStartTime: dateToString(new Date(agenda.agendaStartTime)),
+ agendaEndTime: dateToString(new Date(agenda.agendaEndTime)),
+ };
+ }),
+ totalPage: Math.ceil(getData.data.totalSize / itemsPerPage),
+ currentPage: currentPage,
+ });
+ } catch (e) {
+ console.error('MS00');
+ }
+ }, [currentPage, status, isOfficial]);
+
+ useEffect(() => {
+ getAgendaList();
+ }, [getAgendaList]);
+
+ const renderStatus = (status: string) => {
+ switch (status) {
+ case AgendaStatus.CANCEL:
+ return '취소';
+ case AgendaStatus.OPEN:
+ return '모집 중';
+ case AgendaStatus.CONFIRM:
+ return '진행 중';
+ case AgendaStatus.FINISH:
+ return '진행완료';
+ default:
+ return '알 수 없음';
+ }
+ };
+
+ const renderOfficial = (isOfficial: boolean) => {
+ return isOfficial ? '공식' : '비공식';
+ };
+
+ return (
+ ({
+ announcementList: [],
+ totalPage: 1,
+ currentPage: 1,
+ });
+ const [currentPage, setCurrentPage] = useState(1);
+ const [selectedAgendaKey, setSelectedAgendaKey] = useState('');
+ const agendaList = useFetchGet({ url: 'admin/list' }).data || [];
+
+ useEffect(() => {
+ if (agendaKey) {
+ setSelectedAgendaKey(agendaKey as string);
+ }
+ }, [agendaKey]);
+
+ useEffect(() => {
+ if (selectedAgendaKey) {
+ fetchAnnouncementList();
+ }
+ }, [selectedAgendaKey, currentPage]);
+
+ const fetchAnnouncementList = useCallback(async () => {
+ if (!selectedAgendaKey) return;
+
+ try {
+ const response = await instance.get(`/agenda/admin/announcement`, {
+ params: {
+ agenda_key: selectedAgendaKey,
+ page: currentPage,
+ size: itemsPerPage,
+ },
+ });
+
+ setAnnouncementInfo({
+ announcementList: response.data.content.map(
+ (announce: IAnnouncement) => ({
+ ...announce,
+ createdAt: dateToString(new Date(announce.createdAt)),
+ })
+ ),
+ totalPage: Math.ceil(response.data.totalSize / itemsPerPage),
+ currentPage,
+ });
+ } catch (error) {
+ console.error('Error fetching announcement list:', error);
+ }
+ }, [currentPage, selectedAgendaKey]);
+
+ const handleSelectChange = (event: SelectChangeEvent) => {
+ const newValue = event.target.value as string;
+ setSelectedAgendaKey(newValue);
+ setCurrentPage(1);
+ router.push(`?agendaKey=${newValue}`);
+ };
+
+ const handleButtonAction = (announce: IAnnouncement) => {
+ openModal({
+ type: 'modify',
+ title: '공지사항 수정',
+ description: '변경 후 수정 버튼을 눌러주세요.',
+ FormComponent: AnnouncementForm,
+ data: announce,
+ stringKey: agendaKey as string,
+ isAdmin: true,
+ onProceed: () => {
+ closeModal();
+ fetchAnnouncementList();
+ },
+ });
+ };
+
+ const renderIsShow = (isShow: boolean) => (isShow ? '공개' : '비공개');
+
+ return (
+ ({
+ teamList: [],
+ totalPage: 0,
+ currentPage: 0,
+ });
+
+ const [currentPage, setCurrentPage] = useState(1);
+ const [selectedAgendaKey, setSelectedAgendaKey] = useState('');
+ const agendaList = useFetchGet({ url: 'admin/list' }).data || [];
+ const setSnackBar = useSetRecoilState(toastState);
+
+ const buttonList: string[] = [styles.coin, styles.penalty];
+
+ const deleteTeam = async (teamKey: string) => {
+ await sendRequest(
+ 'PATCH',
+ 'admin/team/cancel',
+ {},
+ { team_key: teamKey },
+ () => {
+ getTeamList();
+ }
+ );
+ };
+
+ const handleButtonAction = (buttonName: string, team: ITeam) => {
+ const teamKey = team.teamKey;
+ switch (buttonName) {
+ case '수정':
+ router.push(
+ `/admin/agenda/teamModify?team_key=${teamKey}&location=${team.teamLocation}`
+ );
+ break;
+ case '취소':
+ deleteTeam(teamKey as string);
+ break;
+ }
+ };
+
+ const getTeamList = useCallback(async () => {
+ try {
+ if (!selectedAgendaKey) {
+ return;
+ }
+
+ const response = await instance.get(`/agenda/admin/team/list`, {
+ params: {
+ agenda_key: selectedAgendaKey,
+ page: currentPage,
+ size: itemsPerPage,
+ },
+ });
+
+ setTeamInfo({
+ teamList: response.data.content,
+ totalPage: Math.ceil(response.data.totalSize / itemsPerPage),
+ currentPage: currentPage,
+ });
+ } catch (e) {
+ console.error('Error fetching team list:', e);
+ }
+ }, [currentPage, selectedAgendaKey, agendaKey]);
+
+ useEffect(() => {
+ if (agendaKey) {
+ setSelectedAgendaKey(agendaKey as string);
+ }
+ }, [agendaKey]);
+
+ useEffect(() => {
+ if (selectedAgendaKey) {
+ getTeamList();
+ }
+ }, [selectedAgendaKey, currentPage, getTeamList]);
+
+ const handleSelectChange = (event: { target: { value: any } }) => {
+ const newValue = event.target.value;
+ setSelectedAgendaKey(newValue);
+ setCurrentPage(1); // 페이지 초기화
+ router.push(`?agendaKey=${newValue}`);
+ };
+
+ const renderStatus = (status: string) => {
+ switch (status) {
+ case TeamStatus.OPEN:
+ return '진행 중';
+ case TeamStatus.CONFIRM:
+ return '완료';
+ case TeamStatus.CANCEL:
+ return '취소';
+ default:
+ return '알 수 없음';
+ }
+ };
+
+ const renderIsPrivate = (isPrivate: boolean) => {
+ return isPrivate ? '비공개' : '공개';
+ };
+
+ return (
+ ({
+ ticketList: [],
+ totalPage: 0,
+ currentPage: 0,
+ });
+ const [currentPage, setCurrentPage] = useState(1);
+ const { openModal, closeModal } = useModal();
+
+ const handleButtonAction = (ticket: ITicket) => {
+ openModal({
+ type: 'modify',
+ title: '티켓 수정',
+ description: '변경 후 수정 버튼을 눌러주세요.',
+ FormComponent: AdminTicketForm,
+ data: ticket,
+ isAdmin: true,
+ stringKey: intraId,
+ onProceed: () => {
+ closeModal();
+ getTicketList();
+ },
+ });
+ };
+
+ const getTicketList = useCallback(async () => {
+ const response = await instance.get(
+ `/agenda/admin/ticket/list/${intraId}`,
+ {
+ params: {
+ page: currentPage,
+ size: itemsPerPage,
+ },
+ }
+ );
+
+ setTicketInfo({
+ ticketList: response.data.content,
+ totalPage: Math.ceil(response.data.totalSize / itemsPerPage),
+ currentPage: currentPage,
+ });
+ }, [currentPage, intraId]);
+
+ useEffect(() => {
+ getTicketList();
+ }, [getTicketList]);
+
+ const renderApprove = (isApproved?: boolean) => {
+ return isApproved ? '발급완료' : '발급대기';
+ };
+ const renderUsed = (isUsed?: boolean) => {
+ return isUsed ? '사용완료' : '사용대기';
+ };
+
+ return (
+ ({
+ userInfoList: [],
+ totalPage: 0,
+ currentPage: 0,
+ });
+ const [currentPage, setCurrentPage] = useState(1);
+ const [intraId, setIntraId] = useState('');
+ const { openModal } = useModal();
+ const buttonList: string[] = [styles.detail, styles.coin, styles.penalty];
+
+ const handleButtonAction = (buttonName: string, intraId: string) => {
+ switch (buttonName) {
+ case '프로필':
+ openModal({
+ type: 'modify',
+ title: '프로필 수정',
+ description: '변경 후 수정 버튼을 눌러주세요.',
+ FormComponent: UserForm,
+ stringKey: intraId,
+ });
+ break;
+
+ case '티켓발급':
+ openModal({
+ type: 'modify',
+ title: '티켓 발급',
+ description: '티켓을 발급하시겠습니까?',
+ FormComponent: TicketForm,
+ stringKey: intraId,
+ });
+ break;
+ case '티켓조회':
+ router.push(`/admin/agenda/ticket?intraId=${intraId}`);
+ break;
+ }
+ };
+
+ const initSearch = useCallback((intraId?: string) => {
+ setIntraId(intraId || '');
+ setCurrentPage(1);
+ }, []);
+
+ const getAllUserInfo = useCallback(async () => {
+ try {
+ const res = await instanceInManage.get(
+ `/users?page=${currentPage}&size=10`
+ );
+ setUserManagements({
+ userInfoList: res.data.userSearchAdminDtos,
+ totalPage: res.data.totalPage,
+ currentPage: currentPage,
+ });
+ } catch (e) {
+ console.error('MS06');
+ }
+ }, [currentPage]);
+
+ const getUserInfo = useCallback(async () => {
+ try {
+ const res = await instanceInManage.get(
+ `/users?intraId=${intraId}&page=${currentPage}&size=10`
+ );
+ setUserManagements({
+ userInfoList: res.data.userSearchAdminDtos,
+ totalPage: res.data.totalPage,
+ currentPage: currentPage,
+ });
+ } catch (e) {
+ console.error('MS05');
+ }
+ }, [intraId, currentPage]);
+
+ useEffect(() => {
+ intraId ? getUserInfo() : getAllUserInfo();
+ }, [intraId, getAllUserInfo, getUserInfo]);
+
+ return (
+ <>
+
+
+ {content}
+
+
+ );
+}
diff --git a/components/admin/takgu/SideNavParty.tsx b/components/admin/takgu/SideNavParty.tsx
new file mode 100644
index 000000000..56ac3d0dd
--- /dev/null
+++ b/components/admin/takgu/SideNavParty.tsx
@@ -0,0 +1,59 @@
+import { useRouter } from 'next/router';
+import {
+ TbNote,
+ TbFileReport,
+ TbMessageReport,
+ TbBuildingWarehouse,
+ TbPlaylistAdd,
+} from 'react-icons/tb';
+import SideNavContent from 'components/admin/SideNavContent';
+import styles from 'styles/admin/SideNav.module.scss';
+
+export default function SideNavParty() {
+ const currentPath = useRouter().asPath.replace('/admin', '');
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/components/admin/takgu/SideNavTakgu.tsx b/components/admin/takgu/SideNavTakgu.tsx
new file mode 100644
index 000000000..27877d471
--- /dev/null
+++ b/components/admin/takgu/SideNavTakgu.tsx
@@ -0,0 +1,140 @@
+import { useRouter } from 'next/router';
+import { BsShop } from 'react-icons/bs';
+import { GoSettings } from 'react-icons/go';
+import {
+ GrUserSettings,
+ GrNotification,
+ GrStatusWarning,
+ GrAnnounce,
+} from 'react-icons/gr';
+import { IoGameControllerOutline, IoReceiptOutline } from 'react-icons/io5';
+import { MdOutlineMessage } from 'react-icons/md';
+import {
+ TbCalendarTime,
+ TbCoin,
+ TbPaperBag,
+ TbTrophy,
+ TbWallet,
+} from 'react-icons/tb';
+import SideNavContent from 'components/admin/SideNavContent';
+import styles from 'styles/admin/SideNav.module.scss';
+
+export default function SideNavTakgu() {
+ const currentPath = useRouter().asPath.replace('/admin', '');
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/components/admin/announcement/AnnounceEdit.tsx b/components/admin/takgu/announcement/AnnounceEdit.tsx
similarity index 95%
rename from components/admin/announcement/AnnounceEdit.tsx
rename to components/admin/takgu/announcement/AnnounceEdit.tsx
index 2af9c27c2..8f2f675fd 100644
--- a/components/admin/announcement/AnnounceEdit.tsx
+++ b/components/admin/takgu/announcement/AnnounceEdit.tsx
@@ -1,11 +1,11 @@
import { useEffect, useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { QUILL_EDIT_MODULES, QUILL_FORMATS } from 'types/quillTypes';
+import { QUILL_EDIT_MODULES, QUILL_FORMATS } from 'types/takgu/quillTypes';
import { instanceInManage, instance } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
import DynamicQuill from 'components/DynamicQuill';
-import { useUser } from 'hooks/Layout/useUser';
-import styles from 'styles/admin/announcement/AnnounceEdit.module.scss';
+import { useUser } from 'hooks/takgu/Layout/useUser';
+import styles from 'styles/admin/takgu/announcement/AnnounceEdit.module.scss';
import 'react-quill/dist/quill.snow.css';
import 'react-quill/dist/quill.bubble.css';
diff --git a/components/admin/announcement/AnnounceList.tsx b/components/admin/takgu/announcement/AnnounceList.tsx
similarity index 95%
rename from components/admin/announcement/AnnounceList.tsx
rename to components/admin/takgu/announcement/AnnounceList.tsx
index 265bfb1cd..a50c37599 100644
--- a/components/admin/announcement/AnnounceList.tsx
+++ b/components/admin/takgu/announcement/AnnounceList.tsx
@@ -10,18 +10,18 @@ import {
import {
IAnnouncement,
IAnnouncementTable,
-} from 'types/admin/adminAnnouncementTypes';
-import { QUILL_FORMATS } from 'types/quillTypes';
+} from 'types/admin/takgu/adminAnnouncementTypes';
+import { QUILL_FORMATS } from 'types/takgu/quillTypes';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import DynamicQuill from 'components/DynamicQuill';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/announcement/AnnounceList.module.scss';
+import styles from 'styles/admin/takgu/announcement/AnnounceList.module.scss';
import 'react-quill/dist/quill.snow.css';
import 'react-quill/dist/quill.bubble.css';
diff --git a/components/admin/coin/CoinMain.tsx b/components/admin/takgu/coin/CoinMain.tsx
similarity index 66%
rename from components/admin/coin/CoinMain.tsx
rename to components/admin/takgu/coin/CoinMain.tsx
index 80c5181f9..d074c015d 100644
--- a/components/admin/coin/CoinMain.tsx
+++ b/components/admin/takgu/coin/CoinMain.tsx
@@ -1,6 +1,6 @@
-import CoinPolicy from 'components/admin/coin/CoinPolicy';
-import CoinPolicyHistory from 'components/admin/coin/CoinPolicyHistory';
-import styles from 'styles/admin/coin/CoinMain.module.scss';
+import CoinPolicy from 'components/admin/takgu/coin/CoinPolicy';
+import CoinPolicyHistory from 'components/admin/takgu/coin/CoinPolicyHistory';
+import styles from 'styles/admin/takgu/coin/CoinMain.module.scss';
export default function CoinMain() {
return (
diff --git a/components/admin/coin/CoinPolicy.tsx b/components/admin/takgu/coin/CoinPolicy.tsx
similarity index 93%
rename from components/admin/coin/CoinPolicy.tsx
rename to components/admin/takgu/coin/CoinPolicy.tsx
index 377ad1382..6614dd8f9 100644
--- a/components/admin/coin/CoinPolicy.tsx
+++ b/components/admin/takgu/coin/CoinPolicy.tsx
@@ -8,10 +8,10 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import { AdminTableHead } from 'components/admin/common/AdminTable';
-import styles from 'styles/admin/coin/CoinPolicy.module.scss';
+import { AdminTableHead } from 'components/admin/takgu/common/AdminTable';
+import styles from 'styles/admin/takgu/coin/CoinPolicy.module.scss';
const tableTitle: { [key: string]: string } = {
attendance: '출석 획득',
diff --git a/components/admin/coin/CoinPolicyHistory.tsx b/components/admin/takgu/coin/CoinPolicyHistory.tsx
similarity index 94%
rename from components/admin/coin/CoinPolicyHistory.tsx
rename to components/admin/takgu/coin/CoinPolicyHistory.tsx
index 58e9bce16..98a2218fa 100644
--- a/components/admin/coin/CoinPolicyHistory.tsx
+++ b/components/admin/takgu/coin/CoinPolicyHistory.tsx
@@ -9,7 +9,7 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { IcoinPolicyHistory } from 'types/admin/adminCoinTypes';
+import { IcoinPolicyHistory } from 'types/admin/takgu/adminCoinTypes';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
import { toastState } from 'utils/recoil/toast';
@@ -17,9 +17,9 @@ import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/coin/CoinPolicyHistory.module.scss';
+import styles from 'styles/admin/takgu/coin/CoinPolicyHistory.module.scss';
const coinPolicyHistoryTableTitle: { [key: string]: string } = {
coinPolicyId: 'ID',
diff --git a/components/admin/common/AdminSearchBar.tsx b/components/admin/takgu/common/AdminSearchBar.tsx
similarity index 96%
rename from components/admin/common/AdminSearchBar.tsx
rename to components/admin/takgu/common/AdminSearchBar.tsx
index ffab4d9a5..1a8299f01 100644
--- a/components/admin/common/AdminSearchBar.tsx
+++ b/components/admin/takgu/common/AdminSearchBar.tsx
@@ -1,7 +1,7 @@
import { GoSearch } from 'react-icons/go';
import { IoIosCloseCircle } from 'react-icons/io';
import useSearchBar from 'hooks/useSearchBar';
-import styles from 'styles/admin/common/AdminSearchBar.module.scss';
+import styles from 'styles/admin/takgu/common/AdminSearchBar.module.scss';
const MAX_SEARCH_LENGTH = 15;
diff --git a/components/admin/common/AdminTable.tsx b/components/admin/takgu/common/AdminTable.tsx
similarity index 72%
rename from components/admin/common/AdminTable.tsx
rename to components/admin/takgu/common/AdminTable.tsx
index 44d328221..1d3fbc7ef 100644
--- a/components/admin/common/AdminTable.tsx
+++ b/components/admin/takgu/common/AdminTable.tsx
@@ -1,15 +1,22 @@
import { useSetRecoilState } from 'recoil';
import { TableCell, TableHead, TableRow } from '@mui/material';
-import { TableName } from 'types/admin/tableTypes';
-import { modalState } from 'utils/recoil/modal';
+import { agendaTableName } from 'types/admin/agenda/agendaTableTypes';
+import { TableName } from 'types/admin/takgu/tableTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { agendaTableFormat } from 'constants/admin/agendaTable';
import { tableFormat } from 'constants/admin/table';
-import styles from 'styles/admin/common/AdminTable.module.scss';
+import styles from 'styles/admin/takgu/common/AdminTable.module.scss';
interface IAdminTableHead {
tableName: TableName;
table: { [key: string]: string };
}
+interface IAdminAgendaTableHead {
+ tableName: agendaTableName;
+ table: { [key: string]: string };
+}
+
export function AdminTableHead({ tableName, table }: IAdminTableHead) {
return (
@@ -24,6 +31,23 @@ export function AdminTableHead({ tableName, table }: IAdminTableHead) {
);
}
+export function AdminAgendaTableHead({
+ tableName,
+ table,
+}: IAdminAgendaTableHead) {
+ return (
+
+
+ {agendaTableFormat[tableName].columns.map((columnName) => (
+
+ {table[columnName]}
+
+ ))}
+
+
+ );
+}
+
interface IAdminEmpty {
content: string;
}
diff --git a/components/admin/feedback/FeedbackTable.tsx b/components/admin/takgu/feedback/FeedbackTable.tsx
similarity index 93%
rename from components/admin/feedback/FeedbackTable.tsx
rename to components/admin/takgu/feedback/FeedbackTable.tsx
index 53d0908fb..28484e32c 100644
--- a/components/admin/feedback/FeedbackTable.tsx
+++ b/components/admin/takgu/feedback/FeedbackTable.tsx
@@ -8,19 +8,22 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { IFeedback, IFeedbackTable } from 'types/admin/adminFeedbackTypes';
+import {
+ IFeedback,
+ IFeedbackTable,
+} from 'types/admin/takgu/adminFeedbackTypes';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
import {
AdminContent,
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/feedback/FeedbackTable.module.scss';
+import styles from 'styles/admin/takgu/feedback/FeedbackTable.module.scss';
const tableTitle: { [key: string]: string } = {
id: 'ID',
diff --git a/components/admin/games/GamesTable.tsx b/components/admin/takgu/games/GamesTable.tsx
similarity index 94%
rename from components/admin/games/GamesTable.tsx
rename to components/admin/takgu/games/GamesTable.tsx
index fa208b83b..9b7704b43 100644
--- a/components/admin/games/GamesTable.tsx
+++ b/components/admin/takgu/games/GamesTable.tsx
@@ -1,11 +1,11 @@
import { useCallback, useEffect, useState } from 'react';
-import { IGames, IGameLog } from 'types/admin/gameLogTypes';
+import { IGames, IGameLog } from 'types/admin/takgu/gameLogTypes';
import { instanceInManage } from 'utils/axios';
import { getFormattedDateToString, gameTimeToString } from 'utils/handleTime';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
-import ModifyScoreForm from 'components/admin/games/ModifyScoreForm';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
+import ModifyScoreForm from 'components/admin/takgu/games/ModifyScoreForm';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/games/GamesTable.module.scss';
+import styles from 'styles/admin/takgu/games/GamesTable.module.scss';
export default function GamesTable() {
const [currentPage, setCurrentPage] = useState(1);
diff --git a/components/admin/games/ModifyScoreForm.tsx b/components/admin/takgu/games/ModifyScoreForm.tsx
similarity index 88%
rename from components/admin/games/ModifyScoreForm.tsx
rename to components/admin/takgu/games/ModifyScoreForm.tsx
index 9e9400b1b..8cc3ec594 100644
--- a/components/admin/games/ModifyScoreForm.tsx
+++ b/components/admin/takgu/games/ModifyScoreForm.tsx
@@ -1,7 +1,7 @@
import { useSetRecoilState } from 'recoil';
-import { ModifyScoreType } from 'types/admin/gameLogTypes';
-import { modalState } from 'utils/recoil/modal';
-import styles from 'styles/admin/games/GamesTable.module.scss';
+import { ModifyScoreType } from 'types/admin/takgu/gameLogTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
+import styles from 'styles/admin/takgu/games/GamesTable.module.scss';
export default function ModifyScoreForm({
gameId,
diff --git a/components/admin/notification/CreateNotiButton.tsx b/components/admin/takgu/notification/CreateNotiButton.tsx
similarity index 72%
rename from components/admin/notification/CreateNotiButton.tsx
rename to components/admin/takgu/notification/CreateNotiButton.tsx
index 78e2a38b7..8a3c29830 100644
--- a/components/admin/notification/CreateNotiButton.tsx
+++ b/components/admin/takgu/notification/CreateNotiButton.tsx
@@ -1,6 +1,6 @@
import { useSetRecoilState } from 'recoil';
-import { modalState } from 'utils/recoil/modal';
-import style from 'styles/admin/notification/CreateNotificationButton.module.scss';
+import { modalState } from 'utils/recoil/takgu/modal';
+import style from 'styles/admin/takgu/notification/CreateNotificationButton.module.scss';
export default function CreateNotiButton() {
const setModal = useSetRecoilState(modalState);
diff --git a/components/admin/notification/NotificationTable.tsx b/components/admin/takgu/notification/NotificationTable.tsx
similarity index 91%
rename from components/admin/notification/NotificationTable.tsx
rename to components/admin/takgu/notification/NotificationTable.tsx
index d80e5ee06..adb087fd5 100644
--- a/components/admin/notification/NotificationTable.tsx
+++ b/components/admin/takgu/notification/NotificationTable.tsx
@@ -11,19 +11,19 @@ import {
import {
INotificaionTable,
INotification,
-} from 'types/admin/adminNotificationTypes';
+} from 'types/admin/takgu/adminNotificationTypes';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
import {
AdminContent,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
-import CreateNotiButton from 'components/admin/notification/CreateNotiButton';
+} from 'components/admin/takgu/common/AdminTable';
+import CreateNotiButton from 'components/admin/takgu/notification/CreateNotiButton';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/notification/NotificationTable.module.scss';
+import styles from 'styles/admin/takgu/notification/NotificationTable.module.scss';
const tableTitle: { [key: string]: string } = {
id: 'ID',
diff --git a/components/admin/party/AdminCommentReport.tsx b/components/admin/takgu/party/AdminCommentReport.tsx
similarity index 93%
rename from components/admin/party/AdminCommentReport.tsx
rename to components/admin/takgu/party/AdminCommentReport.tsx
index b2cbd9ccd..076412c9c 100644
--- a/components/admin/party/AdminCommentReport.tsx
+++ b/components/admin/takgu/party/AdminCommentReport.tsx
@@ -8,16 +8,19 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { PartyCommentReport, PartyCommentReportTable } from 'types/partyTypes';
+import {
+ PartyCommentReport,
+ PartyCommentReportTable,
+} from 'types/takgu/partyTypes';
import { instanceInPartyManage } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
+import styles from 'styles/admin/takgu/party/AdminPartyCommon.module.scss';
const tableTitle: { [key: string]: string } = {
id: '번호',
diff --git a/components/admin/party/AdminPartyNoShow.tsx b/components/admin/takgu/party/AdminPartyNoShow.tsx
similarity index 93%
rename from components/admin/party/AdminPartyNoShow.tsx
rename to components/admin/takgu/party/AdminPartyNoShow.tsx
index fe73aef54..2e22c2b19 100644
--- a/components/admin/party/AdminPartyNoShow.tsx
+++ b/components/admin/takgu/party/AdminPartyNoShow.tsx
@@ -8,16 +8,19 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { PartyNoshowReport, PartyNoshowReportTable } from 'types/partyTypes';
+import {
+ PartyNoshowReport,
+ PartyNoshowReportTable,
+} from 'types/takgu/partyTypes';
import { instanceInPartyManage } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
+import styles from 'styles/admin/takgu/party/AdminPartyCommon.module.scss';
const tableTitle: { [key: string]: string } = {
id: '번호',
diff --git a/components/admin/party/AdminPartyPenalty.tsx b/components/admin/takgu/party/AdminPartyPenalty.tsx
similarity index 94%
rename from components/admin/party/AdminPartyPenalty.tsx
rename to components/admin/takgu/party/AdminPartyPenalty.tsx
index 269dac768..62c80a836 100644
--- a/components/admin/party/AdminPartyPenalty.tsx
+++ b/components/admin/takgu/party/AdminPartyPenalty.tsx
@@ -8,18 +8,18 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { PartyPenaltyAdmin, PartyPenaltyTable } from 'types/partyTypes';
+import { PartyPenaltyAdmin, PartyPenaltyTable } from 'types/takgu/partyTypes';
import { instanceInPartyManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
+import styles from 'styles/admin/takgu/party/AdminPartyCommon.module.scss';
const tableTitle: { [key: string]: string } = {
id: '번호',
diff --git a/components/admin/party/AdminPartyRoomReport.tsx b/components/admin/takgu/party/AdminPartyRoomReport.tsx
similarity index 93%
rename from components/admin/party/AdminPartyRoomReport.tsx
rename to components/admin/takgu/party/AdminPartyRoomReport.tsx
index ffdfe40b0..7c1341495 100644
--- a/components/admin/party/AdminPartyRoomReport.tsx
+++ b/components/admin/takgu/party/AdminPartyRoomReport.tsx
@@ -8,16 +8,16 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { PartyRoomReport, PartyRoomReportTable } from 'types/partyTypes';
+import { PartyRoomReport, PartyRoomReportTable } from 'types/takgu/partyTypes';
import { instanceInPartyManage } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
+import styles from 'styles/admin/takgu/party/AdminPartyCommon.module.scss';
const tableTitle: { [key: string]: string } = {
id: '번호',
diff --git a/components/admin/party/PartyCategory.tsx b/components/admin/takgu/party/PartyCategory.tsx
similarity index 89%
rename from components/admin/party/PartyCategory.tsx
rename to components/admin/takgu/party/PartyCategory.tsx
index c6db2fa4f..9423f1ab3 100644
--- a/components/admin/party/PartyCategory.tsx
+++ b/components/admin/takgu/party/PartyCategory.tsx
@@ -7,11 +7,11 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { PartyCategory } from 'types/partyTypes';
+import { PartyCategory } from 'types/takgu/partyTypes';
import { tableFormat } from 'constants/admin/table';
-import { AdminTableHead } from 'components/admin/common/AdminTable';
-import usePartyCategory from 'hooks/party/usePartyCategory';
-import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
+import { AdminTableHead } from 'components/admin/takgu/common/AdminTable';
+import usePartyCategory from 'hooks/takgu/party/usePartyCategory';
+import styles from 'styles/admin/takgu/party/AdminPartyCommon.module.scss';
const tableTitle: { [key: string]: string } = {
categoryId: '카테고리번호',
diff --git a/components/admin/party/PartyReportNav.tsx b/components/admin/takgu/party/PartyReportNav.tsx
similarity index 94%
rename from components/admin/party/PartyReportNav.tsx
rename to components/admin/takgu/party/PartyReportNav.tsx
index de6392674..33dc1f80f 100644
--- a/components/admin/party/PartyReportNav.tsx
+++ b/components/admin/takgu/party/PartyReportNav.tsx
@@ -1,5 +1,5 @@
import { useState } from 'react';
-import styles from 'styles/party/PartyNav.module.scss';
+import styles from 'styles/takgu/party/PartyNav.module.scss';
import AdminCommentReport from './AdminCommentReport';
import AdminPartyNoShowReport from './AdminPartyNoShow';
import AdminPartyRoomReport from './AdminPartyRoomReport';
diff --git a/components/admin/party/PartyRoomTable.tsx b/components/admin/takgu/party/PartyRoomTable.tsx
similarity index 88%
rename from components/admin/party/PartyRoomTable.tsx
rename to components/admin/takgu/party/PartyRoomTable.tsx
index 7c95d6ac0..6fce4e991 100644
--- a/components/admin/party/PartyRoomTable.tsx
+++ b/components/admin/takgu/party/PartyRoomTable.tsx
@@ -8,15 +8,15 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { PartyRoomColumn } from 'types/admin/adminPartyTypes';
+import { PartyRoomColumn } from 'types/admin/takgu/adminPartyTypes';
import { dateToStringShort } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
-import { AdminTableHead } from 'components/admin/common/AdminTable';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
+import { AdminTableHead } from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import useAdminPartyRoomList from 'hooks/party/useAdminPartyRoomList';
-import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
+import useAdminPartyRoomList from 'hooks/takgu/party/useAdminPartyRoomList';
+import styles from 'styles/admin/takgu/party/AdminPartyCommon.module.scss';
const tableTitle: { [key: string]: string } = {
roomId: 'ID',
diff --git a/components/admin/party/PartyTemplate.tsx b/components/admin/takgu/party/PartyTemplate.tsx
similarity index 92%
rename from components/admin/party/PartyTemplate.tsx
rename to components/admin/takgu/party/PartyTemplate.tsx
index a194d8e87..296c4b7c9 100644
--- a/components/admin/party/PartyTemplate.tsx
+++ b/components/admin/takgu/party/PartyTemplate.tsx
@@ -8,12 +8,12 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { PartyGameTemplate } from 'types/partyTypes';
-import { modalState } from 'utils/recoil/modal';
+import { PartyGameTemplate } from 'types/takgu/partyTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
import { tableFormat } from 'constants/admin/table';
-import { AdminTableHead } from 'components/admin/common/AdminTable';
-import { usePartyTemplate } from 'hooks/party/usePartyTemplate';
-import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
+import { AdminTableHead } from 'components/admin/takgu/common/AdminTable';
+import { usePartyTemplate } from 'hooks/takgu/party/usePartyTemplate';
+import styles from 'styles/admin/takgu/party/AdminPartyCommon.module.scss';
const tableTitle: { [key: string]: string } = {
gameTemplateId: '템플릿번호',
@@ -35,10 +35,6 @@ export default function PartyTemplate() {
const setModal = useSetRecoilState(modalState);
const [selectedCategory, setSelectedCategory] = useState('all');
- useEffect(() => {
- console.log('Render');
- }, [templates]);
-
const handleEditTemplate = (template?: PartyGameTemplate) => {
setModal({ modalName: 'ADMIN-PARTY_TEMPLATE', template });
};
diff --git a/components/admin/penalty/PenaltyTable.tsx b/components/admin/takgu/penalty/PenaltyTable.tsx
similarity index 94%
rename from components/admin/penalty/PenaltyTable.tsx
rename to components/admin/takgu/penalty/PenaltyTable.tsx
index ab93fcbe5..6d22ef132 100644
--- a/components/admin/penalty/PenaltyTable.tsx
+++ b/components/admin/takgu/penalty/PenaltyTable.tsx
@@ -8,18 +8,18 @@ import {
TableCell,
Paper,
} from '@mui/material';
-import { IPenalty, IPenaltyTable } from 'types/admin/adminPenaltyTypes';
+import { IPenalty, IPenaltyTable } from 'types/admin/takgu/adminPenaltyTypes';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/penalty/PenaltyTable.module.scss';
+import styles from 'styles/admin/takgu/penalty/PenaltyTable.module.scss';
const tableTitle: { [key: string]: string } = {
penaltyId: 'ID',
diff --git a/components/admin/receipt/ReceiptList.tsx b/components/admin/takgu/receipt/ReceiptList.tsx
similarity index 95%
rename from components/admin/receipt/ReceiptList.tsx
rename to components/admin/takgu/receipt/ReceiptList.tsx
index 557279706..ad0b73d46 100644
--- a/components/admin/receipt/ReceiptList.tsx
+++ b/components/admin/takgu/receipt/ReceiptList.tsx
@@ -12,18 +12,18 @@ import {
Ireceipt,
IreceiptTable,
itemStatusType,
-} from 'types/admin/adminReceiptType';
+} from 'types/admin/takgu/adminReceiptType';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/receipt/ReceiptList.module.scss';
+import styles from 'styles/admin/takgu/receipt/ReceiptList.module.scss';
const tableTitle: { [key: string]: string } = {
receiptId: 'ID',
diff --git a/components/admin/recruitments/RecruitmentsHistoryList.tsx b/components/admin/takgu/recruitments/RecruitmentsHistoryList.tsx
similarity index 96%
rename from components/admin/recruitments/RecruitmentsHistoryList.tsx
rename to components/admin/takgu/recruitments/RecruitmentsHistoryList.tsx
index dc1f4fc81..1041d3893 100644
--- a/components/admin/recruitments/RecruitmentsHistoryList.tsx
+++ b/components/admin/takgu/recruitments/RecruitmentsHistoryList.tsx
@@ -19,7 +19,7 @@ import {
IrecruitTable,
RecruitmentDetailProps,
RecruitmentsPages,
-} from 'types/admin/adminRecruitmentsTypes';
+} from 'types/admin/takgu/adminRecruitmentsTypes';
import { instance } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
import { toastState } from 'utils/recoil/toast';
@@ -28,9 +28,9 @@ import {
AdminEmptyItem,
AdminTableHead,
AdminContent,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/recruitments/Recruitments.module.scss';
+import styles from 'styles/admin/takgu/recruitments/Recruitments.module.scss';
import MenuTab from './recruitmentsuser/MenuTab';
const tableTitle: { [key: string]: string } = {
diff --git a/components/admin/recruitments/RecruitmentsMain.tsx b/components/admin/takgu/recruitments/RecruitmentsMain.tsx
similarity index 84%
rename from components/admin/recruitments/RecruitmentsMain.tsx
rename to components/admin/takgu/recruitments/RecruitmentsMain.tsx
index b00d660de..7874cec2b 100644
--- a/components/admin/recruitments/RecruitmentsMain.tsx
+++ b/components/admin/takgu/recruitments/RecruitmentsMain.tsx
@@ -1,7 +1,7 @@
import { Dispatch, SetStateAction } from 'react';
import { Button } from '@mui/material';
-import { RecruitmentsMainProps } from 'types/admin/adminRecruitmentsTypes';
-import styles from 'styles/admin/store/StoreMain.module.scss';
+import { RecruitmentsMainProps } from 'types/admin/takgu/adminRecruitmentsTypes';
+import styles from 'styles/admin/takgu/store/StoreMain.module.scss';
import RecruitmentsHistoryList from './RecruitmentsHistoryList';
function RecruitmentsMain({ setPage }: RecruitmentsMainProps) {
diff --git a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx b/components/admin/takgu/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
similarity index 94%
rename from components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
rename to components/admin/takgu/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
index cf31a3d7c..7822b1642 100644
--- a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
@@ -6,10 +6,10 @@ import {
Iquestion,
Irecruit,
RecruitmentDetailProps,
-} from 'types/admin/adminRecruitmentsTypes';
+} from 'types/admin/takgu/adminRecruitmentsTypes';
import { instance } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/recruitments/recruitmentDetail/RecruitmentDetail.module.scss';
+import styles from 'styles/admin/takgu/recruitments/recruitmentDetail/RecruitmentDetail.module.scss';
import ActionSelectorButtons from './components/ActionSelectorButtons';
import QuestionForm from './components/QuestionForm';
import QuillDescriptionViewer from './components/QuillDescriptionViewer';
diff --git a/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx b/components/admin/takgu/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
similarity index 94%
rename from components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
rename to components/admin/takgu/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
index b281ff3ca..9db1f03da 100644
--- a/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
@@ -5,10 +5,10 @@ import {
Irecruit,
RecruitmentEditProps,
RecruitmentsPages,
-} from 'types/admin/adminRecruitmentsTypes';
+} from 'types/admin/takgu/adminRecruitmentsTypes';
import { instance } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/recruitments/recruitmentDetail/components/ActionSelectorButtons.module.scss';
+import styles from 'styles/admin/takgu/recruitments/recruitmentDetail/components/ActionSelectorButtons.module.scss';
interface ActionSelectorButtonsProps {
setPage: Dispatch>;
@@ -67,7 +67,6 @@ export default function ActionSelectorButtons({
}
);
setIsFinish(!checked);
- console.log(res);
} catch (e: any) {
setSnackBar({
toastName: 'patch recruitment',
diff --git a/components/admin/recruitments/recruitmentsDetail/components/QuestionForm.tsx b/components/admin/takgu/recruitments/recruitmentsDetail/components/QuestionForm.tsx
similarity index 93%
rename from components/admin/recruitments/recruitmentsDetail/components/QuestionForm.tsx
rename to components/admin/takgu/recruitments/recruitmentsDetail/components/QuestionForm.tsx
index a25134e66..c326510e0 100644
--- a/components/admin/recruitments/recruitmentsDetail/components/QuestionForm.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsDetail/components/QuestionForm.tsx
@@ -1,8 +1,11 @@
import React from 'react';
import { CheckBox } from '@mui/icons-material';
import { Grid, Paper, Radio, RadioGroup, TextField } from '@mui/material';
-import { IcheckItem, Iquestion } from 'types/admin/adminRecruitmentsTypes';
-import styles from 'styles/admin/recruitments/recruitmentDetail/components/QuestionForm.module.scss';
+import {
+ IcheckItem,
+ Iquestion,
+} from 'types/admin/takgu/adminRecruitmentsTypes';
+import styles from 'styles/admin/takgu/recruitments/recruitmentDetail/components/QuestionForm.module.scss';
interface CheckInputProps {
checkList: IcheckItem[] | undefined;
diff --git a/components/admin/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx b/components/admin/takgu/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx
similarity index 77%
rename from components/admin/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx
rename to components/admin/takgu/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx
index 4fadb0ab1..ae27a8e2e 100644
--- a/components/admin/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx
@@ -1,9 +1,9 @@
import dynamic from 'next/dynamic';
import { Paper } from '@mui/material';
-import { QUILL_FORMATS } from 'types/quillTypes';
+import { QUILL_FORMATS } from 'types/takgu/quillTypes';
import 'react-quill/dist/quill.snow.css';
import DynamicQuill from 'components/DynamicQuill';
-import styles from 'styles/admin/recruitments/recruitmentDetail/components/QuillDescription.module.scss';
+import styles from 'styles/admin/takgu/recruitments/recruitmentDetail/components/QuillDescription.module.scss';
interface QuillDescriptionViewerProps {
contents: string;
diff --git a/components/admin/recruitments/recruitmentsDetail/components/TitleTimeRange.tsx b/components/admin/takgu/recruitments/recruitmentsDetail/components/TitleTimeRange.tsx
similarity index 85%
rename from components/admin/recruitments/recruitmentsDetail/components/TitleTimeRange.tsx
rename to components/admin/takgu/recruitments/recruitmentsDetail/components/TitleTimeRange.tsx
index 41ee24eea..b3c7a01f1 100644
--- a/components/admin/recruitments/recruitmentsDetail/components/TitleTimeRange.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsDetail/components/TitleTimeRange.tsx
@@ -6,10 +6,10 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { Irecruit } from 'types/admin/adminRecruitmentsTypes';
+import { Irecruit } from 'types/admin/takgu/adminRecruitmentsTypes';
import { dateToStringShort } from 'utils/handleTime';
-import { AdminTableHead } from 'components/admin/common/AdminTable';
-import styles from 'styles/admin/recruitments/recruitmentDetail/components/TitleTimeRange.module.scss';
+import { AdminTableHead } from 'components/admin/takgu/common/AdminTable';
+import styles from 'styles/admin/takgu/recruitments/recruitmentDetail/components/TitleTimeRange.module.scss';
const tableTitle: { [key: string]: string } = {
title: '모집 제목',
diff --git a/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx b/components/admin/takgu/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
similarity index 88%
rename from components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
rename to components/admin/takgu/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
index 48843ac0a..d2fd1eba6 100644
--- a/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
@@ -4,9 +4,9 @@ import {
Iquestion,
Irecruit,
RecruitmentEditProps,
-} from 'types/admin/adminRecruitmentsTypes';
-import useRecruitmentEditInfo from 'hooks/recruitments/useRecruitmentEditInfo';
-import styles from 'styles/admin/recruitments/recruitmentEdit/RecruitmentEdit.module.scss';
+} from 'types/admin/takgu/adminRecruitmentsTypes';
+import useRecruitmentEditInfo from 'hooks/takgu/recruitments/useRecruitmentEditInfo';
+import styles from 'styles/admin/takgu/recruitments/recruitmentEdit/RecruitmentEdit.module.scss';
import ActionSelectorButtons from './components/ActionSelectorButtons';
import QuestionFormBuilder from './components/QuestionFormBuilder';
import QuillDescriptionEditor from './components/QuillDescriptionEditor';
diff --git a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx b/components/admin/takgu/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
similarity index 96%
rename from components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
rename to components/admin/takgu/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
index 6e76746f7..91ab94eb1 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
@@ -15,12 +15,12 @@ import {
Irecruit,
RecruitmentsPages,
recruitListData,
-} from 'types/admin/adminRecruitmentsTypes';
+} from 'types/admin/takgu/adminRecruitmentsTypes';
import { instance } from 'utils/axios';
import { dateToDateTimeLocalString } from 'utils/handleTime';
import { InfiniteScroll } from 'utils/infinityScroll';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/recruitments/recruitmentEdit/components/ActionSelectorButtons.module.scss';
+import styles from 'styles/admin/takgu/recruitments/recruitmentEdit/components/ActionSelectorButtons.module.scss';
const ITEM_HEIGHT = 48;
const ITEM_PADDING_TOP = 8;
diff --git a/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx b/components/admin/takgu/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
similarity index 95%
rename from components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
rename to components/admin/takgu/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
index 3990280b0..5b418db40 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
@@ -19,10 +19,13 @@ import {
TextField,
Tooltip,
} from '@mui/material';
-import { IcheckItem, Iquestion } from 'types/admin/adminRecruitmentsTypes';
-import DraggableList from 'components/UI/DraggableList';
-import { IFormManager } from 'hooks/recruitments/useRecruitmentEditInfo';
-import styles from 'styles/admin/recruitments/recruitmentEdit/components/QuestionFormBuilder.module.scss';
+import {
+ IcheckItem,
+ Iquestion,
+} from 'types/admin/takgu/adminRecruitmentsTypes';
+import DraggableList from 'components/takgu/UI/DraggableList';
+import { IFormManager } from 'hooks/takgu/recruitments/useRecruitmentEditInfo';
+import styles from 'styles/admin/takgu/recruitments/recruitmentEdit/components/QuestionFormBuilder.module.scss';
interface CheckInputProps {
checkList: IcheckItem[] | undefined;
diff --git a/components/admin/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx b/components/admin/takgu/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx
similarity index 80%
rename from components/admin/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx
rename to components/admin/takgu/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx
index b83f10c64..68ef94344 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx
@@ -1,8 +1,8 @@
import { Paper } from '@mui/material';
-import { QUILL_EDIT_MODULES, QUILL_FORMATS } from 'types/quillTypes';
+import { QUILL_EDIT_MODULES, QUILL_FORMATS } from 'types/takgu/quillTypes';
import 'react-quill/dist/quill.snow.css';
import DynamicQuill from 'components/DynamicQuill';
-import styles from 'styles/admin/recruitments/recruitmentEdit/components/QuillDescriptionEditor.module.scss';
+import styles from 'styles/admin/takgu/recruitments/recruitmentEdit/components/QuillDescriptionEditor.module.scss';
interface QuillDescriptionEditorProps {
contents: string;
setRecruitmentEditInfoField: (fieldName: string, value: any) => void;
diff --git a/components/admin/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx b/components/admin/takgu/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx
similarity index 91%
rename from components/admin/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx
rename to components/admin/takgu/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx
index d28471e62..53e082e0f 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx
@@ -7,9 +7,9 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { Irecruit } from 'types/admin/adminRecruitmentsTypes';
-import { AdminTableHead } from 'components/admin/common/AdminTable';
-import styles from 'styles/admin/recruitments/recruitmentEdit/components/TitleTimeRangeSelector.module.scss';
+import { Irecruit } from 'types/admin/takgu/adminRecruitmentsTypes';
+import { AdminTableHead } from 'components/admin/takgu/common/AdminTable';
+import styles from 'styles/admin/takgu/recruitments/recruitmentEdit/components/TitleTimeRangeSelector.module.scss';
const tableTitle: { [key: string]: string } = {
title: '모집 제목',
diff --git a/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx b/components/admin/takgu/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
similarity index 89%
rename from components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
rename to components/admin/takgu/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
index f58480b25..bbe400b4b 100644
--- a/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
@@ -8,14 +8,14 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { IcheckItem } from 'types/admin/adminRecruitmentsTypes';
+import { IcheckItem } from 'types/admin/takgu/adminRecruitmentsTypes';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import useRecruitmentUserFilter from 'hooks/recruitments/useRecruitmentUserFilter';
-import styles from 'styles/admin/recruitments/RecruitmentsUser.module.scss';
+import useRecruitmentUserFilter from 'hooks/takgu/recruitments/useRecruitmentUserFilter';
+import styles from 'styles/admin/takgu/recruitments/RecruitmentsUser.module.scss';
import RecruitmentFilterOptions from './RecruitmentFilterOptions';
import RenderTableCells from './RenderTableCells';
diff --git a/components/admin/recruitments/recruitmentsuser/MenuTab.tsx b/components/admin/takgu/recruitments/recruitmentsuser/MenuTab.tsx
similarity index 83%
rename from components/admin/recruitments/recruitmentsuser/MenuTab.tsx
rename to components/admin/takgu/recruitments/recruitmentsuser/MenuTab.tsx
index 3a759e87a..96b5f9373 100644
--- a/components/admin/recruitments/recruitmentsuser/MenuTab.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsuser/MenuTab.tsx
@@ -1,8 +1,8 @@
import { Dispatch, SetStateAction, useEffect, useState } from 'react';
-import { RecruitmentsPages } from 'types/admin/adminRecruitmentsTypes';
-import DetailRecruitUserList from 'components/admin/recruitments/recruitmentsuser/DetailRecruitUserList';
-import NotificationResults from 'components/admin/recruitments/recruitmentsuser/NotificationResults';
-import styles from 'styles/admin/recruitments/MenuTab.module.scss';
+import { RecruitmentsPages } from 'types/admin/takgu/adminRecruitmentsTypes';
+import DetailRecruitUserList from 'components/admin/takgu/recruitments/recruitmentsuser/DetailRecruitUserList';
+import NotificationResults from 'components/admin/takgu/recruitments/recruitmentsuser/NotificationResults';
+import styles from 'styles/admin/takgu/recruitments/MenuTab.module.scss';
import RecruitmentsHistoryList from '../RecruitmentsHistoryList';
function MenuTab({
diff --git a/components/admin/recruitments/recruitmentsuser/NotificationResults.tsx b/components/admin/takgu/recruitments/recruitmentsuser/NotificationResults.tsx
similarity index 97%
rename from components/admin/recruitments/recruitmentsuser/NotificationResults.tsx
rename to components/admin/takgu/recruitments/recruitmentsuser/NotificationResults.tsx
index e643a370d..1f721823d 100644
--- a/components/admin/recruitments/recruitmentsuser/NotificationResults.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsuser/NotificationResults.tsx
@@ -15,17 +15,17 @@ import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
import {
Inotication,
InoticationTable,
-} from 'types/admin/adminRecruitmentsTypes';
+} from 'types/admin/takgu/adminRecruitmentsTypes';
import { instance } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/recruitments/RecruitmentsUser.module.scss';
+import styles from 'styles/admin/takgu/recruitments/RecruitmentsUser.module.scss';
import 'react-datepicker/dist/react-datepicker.css';
const tableTitle: { [key: string]: string } = {
diff --git a/components/admin/recruitments/recruitmentsuser/RecruitSearchBar.tsx b/components/admin/takgu/recruitments/recruitmentsuser/RecruitSearchBar.tsx
similarity index 89%
rename from components/admin/recruitments/recruitmentsuser/RecruitSearchBar.tsx
rename to components/admin/takgu/recruitments/recruitmentsuser/RecruitSearchBar.tsx
index 6815e5901..83e7c0640 100644
--- a/components/admin/recruitments/recruitmentsuser/RecruitSearchBar.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsuser/RecruitSearchBar.tsx
@@ -1,8 +1,8 @@
import { GoSearch } from 'react-icons/go';
import { IoIosCloseCircle } from 'react-icons/io';
-import useRecruitmentUserFilter from 'hooks/recruitments/useRecruitmentUserFilter';
+import useRecruitmentUserFilter from 'hooks/takgu/recruitments/useRecruitmentUserFilter';
import useSearchBar from 'hooks/useSearchBar';
-import styles from 'styles/admin/common/AdminSearchBar.module.scss';
+import styles from 'styles/admin/takgu/common/AdminSearchBar.module.scss';
const MAX_SEARCH_LENGTH = 15;
diff --git a/components/admin/recruitments/recruitmentsuser/RecruitmentFilterOptions.tsx b/components/admin/takgu/recruitments/recruitmentsuser/RecruitmentFilterOptions.tsx
similarity index 90%
rename from components/admin/recruitments/recruitmentsuser/RecruitmentFilterOptions.tsx
rename to components/admin/takgu/recruitments/recruitmentsuser/RecruitmentFilterOptions.tsx
index 002cfd330..258748b4d 100644
--- a/components/admin/recruitments/recruitmentsuser/RecruitmentFilterOptions.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsuser/RecruitmentFilterOptions.tsx
@@ -10,9 +10,9 @@ import {
import {
IcheckItem,
IrecruitUserTable,
-} from 'types/admin/adminRecruitmentsTypes';
-import useRecruitmentUserFilter from 'hooks/recruitments/useRecruitmentUserFilter';
-import styles from 'styles/admin/recruitments/RecruitmentsUser.module.scss';
+} from 'types/admin/takgu/adminRecruitmentsTypes';
+import useRecruitmentUserFilter from 'hooks/takgu/recruitments/useRecruitmentUserFilter';
+import styles from 'styles/admin/takgu/recruitments/RecruitmentsUser.module.scss';
import RecruitSearchBar from './RecruitSearchBar';
const ITEM_HEIGHT = 48;
diff --git a/components/admin/recruitments/recruitmentsuser/RenderTableCells.tsx b/components/admin/takgu/recruitments/recruitmentsuser/RenderTableCells.tsx
similarity index 93%
rename from components/admin/recruitments/recruitmentsuser/RenderTableCells.tsx
rename to components/admin/takgu/recruitments/recruitmentsuser/RenderTableCells.tsx
index 42401e06d..5b9b831a1 100644
--- a/components/admin/recruitments/recruitmentsuser/RenderTableCells.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsuser/RenderTableCells.tsx
@@ -2,9 +2,9 @@ import React, { useState } from 'react';
import ChevronRightIcon from '@mui/icons-material/ChevronRight';
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
import { TableCell, TableRow, IconButton, TableRowProps } from '@mui/material';
-import { IrecruitUserTable } from 'types/admin/adminRecruitmentsTypes';
-import { DetailContentHover } from 'components/admin/common/AdminTable';
-import styles from 'styles/admin/recruitments/RecruitmentsUser.module.scss';
+import { IrecruitUserTable } from 'types/admin/takgu/adminRecruitmentsTypes';
+import { DetailContentHover } from 'components/admin/takgu/common/AdminTable';
+import styles from 'styles/admin/takgu/recruitments/RecruitmentsUser.module.scss';
interface ExpandableTableRowProps extends TableRowProps {
children: React.ReactNode;
diff --git a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx b/components/admin/takgu/recruitments/recruitmentsuser/tmplateEditor.tsx
similarity index 93%
rename from components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
rename to components/admin/takgu/recruitments/recruitmentsuser/tmplateEditor.tsx
index d2ca72ec9..f126f588d 100644
--- a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
+++ b/components/admin/takgu/recruitments/recruitmentsuser/tmplateEditor.tsx
@@ -1,9 +1,9 @@
import { useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { IRecruitMessageTemplate } from 'types/recruit/recruitments';
+import { IRecruitMessageTemplate } from 'types/takgu/recruit/recruitments';
import { instance } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/modal/AdminRecruitMessageTemplateModal.module.scss';
+import styles from 'styles/admin/takgu/modal/AdminRecruitMessageTemplateModal.module.scss';
function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
const [template, setTemplate] = useState({
diff --git a/components/admin/season/SeasonCreate.tsx b/components/admin/takgu/season/SeasonCreate.tsx
similarity index 93%
rename from components/admin/season/SeasonCreate.tsx
rename to components/admin/takgu/season/SeasonCreate.tsx
index 44a0950d5..691a1dbf9 100644
--- a/components/admin/season/SeasonCreate.tsx
+++ b/components/admin/takgu/season/SeasonCreate.tsx
@@ -8,11 +8,11 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { ISeasonEditInfo } from 'types/seasonTypes';
+import { ISeasonEditInfo } from 'types/takgu/seasonTypes';
import { instanceInManage } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
-import { AdminTableHead } from 'components/admin/common/AdminTable';
-import styles from 'styles/admin/season/SeasonCreate.module.scss';
+import { AdminTableHead } from 'components/admin/takgu/common/AdminTable';
+import styles from 'styles/admin/takgu/season/SeasonCreate.module.scss';
const tableTitle: { [key: string]: string } = {
seasonName: '시즌 이름',
diff --git a/components/admin/season/SeasonList.tsx b/components/admin/takgu/season/SeasonList.tsx
similarity index 96%
rename from components/admin/season/SeasonList.tsx
rename to components/admin/takgu/season/SeasonList.tsx
index 86208c61d..238f83f7b 100644
--- a/components/admin/season/SeasonList.tsx
+++ b/components/admin/takgu/season/SeasonList.tsx
@@ -8,12 +8,12 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { ISeason, ISeasonList } from 'types/seasonTypes';
+import { ISeason, ISeasonList } from 'types/takgu/seasonTypes';
import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
-import styles from 'styles/admin/season/SeasonList.module.scss';
+import styles from 'styles/admin/takgu/season/SeasonList.module.scss';
import { AdminTableHead } from '../common/AdminTable';
const tableTitle: { [key: string]: string } = {
diff --git a/components/admin/slot/SlotCurrent.tsx b/components/admin/takgu/slot/SlotCurrent.tsx
similarity index 95%
rename from components/admin/slot/SlotCurrent.tsx
rename to components/admin/takgu/slot/SlotCurrent.tsx
index 8d2e34336..272e0414a 100644
--- a/components/admin/slot/SlotCurrent.tsx
+++ b/components/admin/takgu/slot/SlotCurrent.tsx
@@ -3,8 +3,8 @@ import {
CurrentMatch,
SlotCurrentProps,
Slots,
-} from 'types/admin/adminSlotTypes';
-import styles from 'styles/admin/slot/SlotCurrent.module.scss';
+} from 'types/admin/takgu/adminSlotTypes';
+import styles from 'styles/admin/takgu/slot/SlotCurrent.module.scss';
export default function SlotCurrent(props: SlotCurrentProps) {
const [slotInfo, setSlotInfo] = useState({
diff --git a/components/admin/slot/SlotMain.tsx b/components/admin/takgu/slot/SlotMain.tsx
similarity index 97%
rename from components/admin/slot/SlotMain.tsx
rename to components/admin/takgu/slot/SlotMain.tsx
index 8094064c4..8fe616f2e 100644
--- a/components/admin/slot/SlotMain.tsx
+++ b/components/admin/takgu/slot/SlotMain.tsx
@@ -1,12 +1,12 @@
import { useEffect, useState } from 'react';
import { useSetRecoilState } from 'recoil';
import { GrLocationPin } from 'react-icons/gr';
-import { CurrentMatch, EditedSchedule } from 'types/admin/adminSlotTypes';
+import { CurrentMatch, EditedSchedule } from 'types/admin/takgu/adminSlotTypes';
import { instance, instanceInManage } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
-import SlotCurrent from 'components/admin/slot/SlotCurrent';
-import SlotPreview from 'components/admin/slot/SlotPreview';
-import styles from 'styles/admin/slot/SlotMain.module.scss';
+import SlotCurrent from 'components/admin/takgu/slot/SlotCurrent';
+import SlotPreview from 'components/admin/takgu/slot/SlotPreview';
+import styles from 'styles/admin/takgu/slot/SlotMain.module.scss';
export default function SlotMain() {
const [scheduleInfo, setScheduleInfo] = useState({
diff --git a/components/admin/slot/SlotPreview.tsx b/components/admin/takgu/slot/SlotPreview.tsx
similarity index 96%
rename from components/admin/slot/SlotPreview.tsx
rename to components/admin/takgu/slot/SlotPreview.tsx
index b3ac4abc0..a7c7972d9 100644
--- a/components/admin/slot/SlotPreview.tsx
+++ b/components/admin/takgu/slot/SlotPreview.tsx
@@ -3,8 +3,8 @@ import {
PreviewMatch,
SlotPreviewProps,
Slot,
-} from 'types/admin/adminSlotTypes';
-import styles from 'styles/admin/slot/SlotCurrent.module.scss';
+} from 'types/admin/takgu/adminSlotTypes';
+import styles from 'styles/admin/takgu/slot/SlotCurrent.module.scss';
export default function SlotPreview(props: SlotPreviewProps) {
const { lastHour, scheduleInfo, currentHour, futurePreview } = props;
diff --git a/components/admin/store/StoreItemHistory.tsx b/components/admin/takgu/store/StoreItemHistory.tsx
similarity index 93%
rename from components/admin/store/StoreItemHistory.tsx
rename to components/admin/takgu/store/StoreItemHistory.tsx
index a6058bb7b..65048eb20 100644
--- a/components/admin/store/StoreItemHistory.tsx
+++ b/components/admin/takgu/store/StoreItemHistory.tsx
@@ -10,18 +10,18 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { IitemHistory } from 'types/admin/adminStoreTypes';
+import { IitemHistory } from 'types/admin/takgu/adminStoreTypes';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/store/ItemHistory.module.scss';
+import styles from 'styles/admin/takgu/store/ItemHistory.module.scss';
const tableTitle: { [key: string]: string } = {
itemId: 'ID',
@@ -100,7 +100,7 @@ function StoreItemHistory() {
src={
itemHistory.imageUri
? itemHistory[columnName]
- : '/image/not_found.svg'
+ : '/image/takgu/not_found.svg'
}
width={30}
height={30}
diff --git a/components/admin/store/StoreItemList.tsx b/components/admin/takgu/store/StoreItemList.tsx
similarity index 94%
rename from components/admin/store/StoreItemList.tsx
rename to components/admin/takgu/store/StoreItemList.tsx
index d70f6e5cc..908c8b44c 100644
--- a/components/admin/store/StoreItemList.tsx
+++ b/components/admin/takgu/store/StoreItemList.tsx
@@ -9,16 +9,16 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { Item } from 'types/itemTypes';
+import { Item } from 'types/takgu/itemTypes';
import { instance } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
-import styles from 'styles/admin/store/ItemList.module.scss';
+} from 'components/admin/takgu/common/AdminTable';
+import styles from 'styles/admin/takgu/store/ItemList.module.scss';
const tableTitle: { [key: string]: string } = {
itemId: 'ID',
@@ -92,7 +92,7 @@ function StoreItemList() {
src={
item.imageUri
? item[columnName]
- : '/image/not_found.svg'
+ : '/image/takgu/not_found.svg'
}
alt='Item Iamge'
width={30}
diff --git a/components/admin/store/StoreMain.tsx b/components/admin/takgu/store/StoreMain.tsx
similarity index 65%
rename from components/admin/store/StoreMain.tsx
rename to components/admin/takgu/store/StoreMain.tsx
index c6b7a7279..709eef87c 100644
--- a/components/admin/store/StoreMain.tsx
+++ b/components/admin/takgu/store/StoreMain.tsx
@@ -1,6 +1,6 @@
-import StoreItemHistory from 'components/admin/store/StoreItemHistory';
-import StoreItemList from 'components/admin/store/StoreItemList';
-import styles from 'styles/admin/store/StoreMain.module.scss';
+import StoreItemHistory from 'components/admin/takgu/store/StoreItemHistory';
+import StoreItemList from 'components/admin/takgu/store/StoreItemList';
+import styles from 'styles/admin/takgu/store/StoreMain.module.scss';
function StoreMain() {
return (
diff --git a/components/admin/tournament/TournamentEdit.tsx b/components/admin/takgu/tournament/TournamentEdit.tsx
similarity index 96%
rename from components/admin/tournament/TournamentEdit.tsx
rename to components/admin/takgu/tournament/TournamentEdit.tsx
index 7b4a35acf..5f0c3920a 100644
--- a/components/admin/tournament/TournamentEdit.tsx
+++ b/components/admin/takgu/tournament/TournamentEdit.tsx
@@ -8,13 +8,13 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { ITournamentEditInfo } from 'types/admin/adminTournamentTypes';
-import { QUILL_EDIT_MODULES, QUILL_FORMATS } from 'types/quillTypes';
+import { ITournamentEditInfo } from 'types/admin/takgu/adminTournamentTypes';
+import { QUILL_EDIT_MODULES, QUILL_FORMATS } from 'types/takgu/quillTypes';
import { instanceInManage } from 'utils/axios';
import { dateToKRIOSString, dateToKRLocaleTimeString } from 'utils/handleTime';
import { toastState } from 'utils/recoil/toast';
import DynamicQuill from 'components/DynamicQuill';
-import styles from 'styles/admin/tournament/TournamentEdit.module.scss';
+import styles from 'styles/admin/takgu/tournament/TournamentEdit.module.scss';
import 'react-quill/dist/quill.snow.css';
import 'react-quill/dist/quill.bubble.css';
import TournamentModalPreview from './TournamentModalPreview';
diff --git a/components/admin/tournament/TournamentEditBraket.tsx b/components/admin/takgu/tournament/TournamentEditBraket.tsx
similarity index 100%
rename from components/admin/tournament/TournamentEditBraket.tsx
rename to components/admin/takgu/tournament/TournamentEditBraket.tsx
diff --git a/components/admin/tournament/TournamentEditMatch.tsx b/components/admin/takgu/tournament/TournamentEditMatch.tsx
similarity index 91%
rename from components/admin/tournament/TournamentEditMatch.tsx
rename to components/admin/takgu/tournament/TournamentEditMatch.tsx
index 2daf7f67b..f9a4b5cd6 100644
--- a/components/admin/tournament/TournamentEditMatch.tsx
+++ b/components/admin/takgu/tournament/TournamentEditMatch.tsx
@@ -5,10 +5,10 @@ import {
Participant,
} from '@g-loot/react-tournament-brackets/dist/src/types';
import { useContext, useRef, useState } from 'react';
-import { TournamentIdContext } from 'components/modal/admin/AdminEditTournamentBraket';
-import PlayerImage from 'components/PlayerImage';
-import useTournamentMatchEditor from 'hooks/tournament/useTournamentMatchEditor';
-import styles from 'styles/admin/tournament/TournamentEditMatch.module.scss';
+import { TournamentIdContext } from 'components/takgu/modal/admin/AdminEditTournamentBraket';
+import PlayerImage from 'components/takgu/PlayerImage';
+import useTournamentMatchEditor from 'hooks/takgu/tournament/useTournamentMatchEditor';
+import styles from 'styles/admin/takgu/tournament/TournamentEditMatch.module.scss';
interface TournamentMatchPartyProps {
party: Participant;
@@ -30,7 +30,7 @@ function TournamentMatchParty({
>
) => {
+ if (
+ teamData.teamStatus === TeamStatus.CANCEL &&
+ e.target.value !== TeamStatus.CANCEL
+ ) {
+ if (
+ !teamMates.some(
+ (member) => member.intraId === teamData.teamLeaderIntraId
+ )
+ ) {
+ setTeamMates((prev) => [
+ { intraId: teamData.teamLeaderIntraId, coalition: Coalition.OTHER },
+ ...prev,
+ ]);
+ }
+ }
+ };
+
+ const SubmitTeamForm = (event: React.FormEvent) => {
+ event.preventDefault();
+
+ const formData = new FormData(event.currentTarget);
+ const data = transformFormData(formData);
+
+ if (!data.teamName || !data.teamContent || !data.teamStatus) {
+ alert('모든 항목을 입력해주세요.');
+ return;
+ }
+
+ sendRequest(
+ 'PATCH',
+ 'admin/team',
+ {
+ ...data,
+ teamKey,
+ teamMates,
+ teamAward: teamData.teamAward,
+ teamAwardPriority: teamData.teamAwardPriority,
+ },
+ {},
+ () => router.back(),
+ (err: string) => console.error(err)
+ );
+ };
+
+ return (
+
+ );
+};
+
+export default AdminTeamForm;
diff --git a/components/agenda/Form/AdminTicketForm.tsx b/components/agenda/Form/AdminTicketForm.tsx
new file mode 100644
index 000000000..cdf67b14f
--- /dev/null
+++ b/components/agenda/Form/AdminTicketForm.tsx
@@ -0,0 +1,156 @@
+import { useState } from 'react';
+import { ITicket } from 'types/agenda/ticket/ticketTypes';
+import AgendaSelect from 'components/agenda/Input/AgendaSelect';
+import { useModal } from 'components/agenda/modal/useModal';
+import useFetchGet from 'hooks/agenda/useFetchGet';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/agenda/Form/Form.module.scss';
+import CheckboxInput from '../Input/CheckboxInput';
+import DateInput from '../Input/TimeInput';
+
+interface userFormProps {
+ stringKey: string;
+ data: ITicket;
+ onProceed?: () => void;
+}
+
+const AdminTicketForm = ({ stringKey, data, onProceed }: userFormProps) => {
+ const { closeModal } = useModal();
+ const sendRequest = useFetchRequest().sendRequest;
+ const agendaList = useFetchGet({ url: 'admin/list' }).data || [];
+
+ const [issuedFromKey, setIssuedFromKey] = useState(
+ data.issuedFromKey ? data.issuedFromKey : ''
+ );
+ const [usedToKey, setUsedToKey] = useState(
+ data.usedToKey ? data.usedToKey : ''
+ );
+ const [isApproved, setIsApproved] = useState(data ? data.isApproved : false);
+ const [isUsed, setIsUsed] = useState(data ? data.isUsed : false);
+
+ const handleissuedFrom = (e: { target: { value: any } }) => {
+ setIssuedFromKey(e.target.value);
+ };
+ const handleusedTo = (e: { target: { value: any } }) => {
+ setUsedToKey(e.target.value);
+ };
+
+ const handleSubmit = async (e: React.FormEvent) => {
+ e.preventDefault();
+
+ const formData = new FormData(e.currentTarget);
+ const jsonData: any = {};
+
+ formData.forEach((value, key) => {
+ jsonData[key] = value;
+ });
+
+ jsonData.issuedFromKey = issuedFromKey;
+ jsonData.usedToKey = usedToKey;
+ jsonData.isApproved = isApproved;
+ jsonData.isUsed = isUsed;
+
+ sendRequest(
+ 'PATCH',
+ 'admin/ticket',
+ jsonData,
+ { ticketId: data.ticketId },
+ () => {
+ onProceed && onProceed();
+ },
+ (error: string) => {
+ console.error(error);
+ }
+ );
+ };
+
+ return (
+
+ );
+};
+
+export default AdminTicketForm;
diff --git a/components/agenda/Form/AgendaForm.tsx b/components/agenda/Form/AgendaForm.tsx
new file mode 100644
index 000000000..cf2644a4c
--- /dev/null
+++ b/components/agenda/Form/AgendaForm.tsx
@@ -0,0 +1,400 @@
+import { useRouter } from 'next/router';
+import { useState } from 'react';
+import { useSetRecoilState } from 'recoil';
+import { Slider } from '@mui/material';
+import { getRemainTime } from 'utils/handleTime';
+import { toastState } from 'utils/recoil/toast';
+import CheckboxInput from 'components/agenda/Input/CheckboxInput';
+import DescriptionInput from 'components/agenda/Input/DescriptionInput';
+import ImageInput from 'components/agenda/Input/ImageInput';
+import SelectInput from 'components/agenda/Input/SelectInput';
+import TimeInput from 'components/agenda/Input/TimeInput';
+import TitleInput from 'components/agenda/Input/TitleInput';
+import { useModal } from 'components/agenda/modal/useModal';
+import styles from 'styles/agenda/Form/Form.module.scss';
+import SubmitAgendaForm from './SubmitAgendaForm';
+
+interface CreateAgendaFormProps {
+ isAdmin?: boolean;
+ isEdit?: boolean;
+ data?: any;
+ stringKey?: string;
+ onProceed?: () => void;
+}
+
+const AgendaForm = ({
+ isAdmin = false,
+ isEdit = false,
+ data,
+ stringKey,
+ onProceed,
+}: CreateAgendaFormProps) => {
+ const { openModal } = useModal();
+ const setSnackBar = useSetRecoilState(toastState);
+ const router = useRouter();
+ const minDistance = 1;
+ // 날짜 초기화
+ const today = new Date();
+ const tommorrow = new Date(); // 기준값으로 사용
+ tommorrow.setDate(today.getDate() + 1);
+ tommorrow.setHours(0);
+ tommorrow.setMinutes(0);
+ tommorrow.setSeconds(0);
+ tommorrow.setMilliseconds(0);
+ const startDate = new Date();
+ const endDate = new Date();
+ startDate.setDate(tommorrow.getDate() + 3);
+ endDate.setDate(tommorrow.getDate() + 7);
+
+ const [recruitEnd, setRecruitEnd] = useState(
+ isEdit ? new Date(data.agendaDeadLine) : new Date(tommorrow)
+ );
+ const [dateRange, setDateRange] = useState([
+ isEdit ? new Date(data.agendaStartTime) : startDate,
+ isEdit ? new Date(data.agendaEndTime) : endDate,
+ ]);
+ const [dateWarn, setDateWarn] = useState(['', '']);
+ const [teamLimit, setTeamLimit] = useState([
+ isEdit ? data.agendaMinTeam : 10,
+ isEdit ? data.agendaMaxTeam : 50,
+ ]);
+ const [peopleLimit, setPeopleLimit] = useState([
+ isEdit ? data.agendaMinPeople : 3,
+ isEdit ? data.agendaMaxPeople : 5,
+ ]);
+ const [isSolo, setIsSolo] = useState(
+ isEdit ? data.agendaMaxPeople === 1 : false
+ );
+
+ // team limit
+ const handleChange = (
+ event: Event,
+ newValue: number | number[],
+ activeThumb: number
+ ) => {
+ if (!Array.isArray(newValue)) {
+ return;
+ }
+ if (newValue[1] - newValue[0] < minDistance) {
+ if (activeThumb === 0) {
+ const clamped = Math.min(newValue[0], 100 - minDistance);
+ setTeamLimit([clamped, clamped + minDistance]);
+ } else {
+ const clamped = Math.max(newValue[1], minDistance);
+ if (clamped - minDistance < newValue[0]) setTeamLimit([2, 10]);
+ else setTeamLimit([clamped - minDistance, clamped]);
+ }
+ } else {
+ setTeamLimit(newValue as number[]);
+ }
+ };
+
+ // people limit
+ const handleChangePeople = (
+ event: Event,
+ newValue: number | number[],
+ activeThumb: number
+ ) => {
+ if (!Array.isArray(newValue)) {
+ return;
+ }
+ setPeopleLimit(newValue as number[]);
+ };
+
+ const handleRecruitEnd = (e: React.ChangeEvent) => {
+ if (!e.target.value) return;
+ const newEnd = new Date(e.target.value);
+
+ checkWarn(newEnd, 0);
+ setRecruitEnd(new Date(e.target.value));
+ };
+
+ const handleIsSolo = (e: React.ChangeEvent) => {
+ if (e.target.checked) setIsSolo(true);
+ else if (!e.target.checked) setIsSolo(false);
+ };
+ const handleDateRangeMin = (e: React.ChangeEvent) => {
+ if (!e.target.value) return;
+ const newMax = new Date(e.target.value);
+ checkWarn(newMax, 1);
+ setDateRange([new Date(e.target.value), dateRange[1]]);
+ };
+ const handleDateRangeMax = (e: React.ChangeEvent) => {
+ if (!e.target.value) return;
+ const newMax = new Date(e.target.value);
+ checkWarn(newMax, 2);
+ setDateRange([dateRange[0], new Date(e.target.value)]);
+ };
+
+ function checkWarn(newDate: Date, index: number) {
+ const newWarning = [...dateWarn];
+ const DateValues = [recruitEnd, dateRange[0], dateRange[1]];
+
+ DateValues[index] = newDate;
+ tommorrow.setHours(0);
+ tommorrow.setMinutes(0);
+ tommorrow.setSeconds(0);
+ tommorrow.setMilliseconds(0);
+ // 모집마감일 오류
+ if (!isAdmin && DateValues[0].getTime() < tommorrow.getTime()) {
+ newWarning[0] = '내일 이후의 날짜를 선택해주세요';
+ } else if (
+ DateValues[0].getTime() > DateValues[1].getTime() ||
+ DateValues[0].getTime() > DateValues[2].getTime()
+ ) {
+ newWarning[0] = '대회 진행일 이전의 날짜를 선택해주세요';
+ } else {
+ newWarning[0] = '';
+ }
+ // 대회 기간 시작일 오류
+ if (!isAdmin && DateValues[1].getTime() < tommorrow.getTime()) {
+ newWarning[1] = '내일 이후의 날짜를 선택해주세요';
+ } else if (DateValues[1].getTime() > DateValues[2].getTime()) {
+ newWarning[1] = '종료일보다 시작일이 뒤에 있습니다.';
+ } else if (DateValues[1].getTime() < DateValues[0].getTime()) {
+ newWarning[1] = '모집 마감일 이후의 날짜를 선택해주세요';
+ } else {
+ newWarning[1] = '';
+ }
+ // 대회 기간 종료일 오류
+ if (!isAdmin && DateValues[2].getTime() < tommorrow.getTime()) {
+ newWarning[2] = '내일 이후의 날짜를 선택해주세요.';
+ } else if (DateValues[2].getTime() < DateValues[1].getTime()) {
+ newWarning[2] = '시작일보다 이전 날짜입니다.';
+ } else if (DateValues[2].getTime() < DateValues[0].getTime()) {
+ newWarning[2] = '모집일보다도 이전 날짜입니다.';
+ } else {
+ newWarning[2] = '';
+ }
+ setDateWarn(newWarning);
+ }
+ // ---------------------------------------------------------
+ const { closeModal } = useModal();
+ const handleSuccess = () => {
+ if (onProceed) {
+ onProceed();
+ } else {
+ closeModal();
+ }
+ };
+ const oncancel = () => {
+ if (isAdmin) {
+ closeModal();
+ } else {
+ window.history.back();
+ }
+ };
+
+ const scrollType = isAdmin ? styles.modalContainer : styles.pageContianer;
+ const rankingType = isEdit ? 'isRanking' : 'agendaIsRanking';
+
+ return (
+ <>
+
+
+ );
+};
+
+export default AgendaForm;
diff --git a/components/agenda/Form/AgendaResultForm.tsx b/components/agenda/Form/AgendaResultForm.tsx
new file mode 100644
index 000000000..a4dabbc2b
--- /dev/null
+++ b/components/agenda/Form/AgendaResultForm.tsx
@@ -0,0 +1,285 @@
+import router from 'next/router';
+import React, { useEffect, useRef } from 'react';
+import {
+ AddElementBtn,
+ DragBtn,
+ RemoveElementBtn,
+} from 'components/agenda/button/Buttons';
+import SelectInput from 'components/agenda/Input/SelectInput';
+import useDraggable from 'components/agenda/utils/useDraggable';
+import styles from 'styles/agenda/Form/AgendaResultForm.module.scss';
+import dragStyles from 'styles/agenda/utils/draggable.module.scss';
+
+interface awardType {
+ award: string;
+ teams: string[];
+ idx?: number;
+}
+interface AgendaResultFormProps {
+ awardList: awardType[];
+ setAwardList: (args0: awardType[]) => void;
+ teamlist: string[];
+ SubmitAgendaResult: (e: React.FormEvent) => void;
+}
+
+const AgendaResultForm = ({
+ awardList,
+ setAwardList,
+ teamlist,
+ SubmitAgendaResult,
+}: AgendaResultFormProps) => {
+ const newAwardInputRef = useRef(null);
+ const defaultTeam = '팀을 선택해주세요';
+ const dragging = useRef(null); // draggable 필요한거
+
+ const addTeam = (
+ idx: number,
+ e: React.ChangeEvent,
+ selected: boolean
+ ) => {
+ if (!selected) return;
+ const newTeam = e.target.value;
+ if (awardList[idx].teams.includes(newTeam)) {
+ e.target.value = defaultTeam;
+ return;
+ }
+ awardList[idx].teams.push(newTeam);
+ e.target.value = defaultTeam;
+ setAwardList([...awardList]);
+ };
+
+ const modifyTeam = (idx: number, teamidx: number, newTeam: string) => {
+ if (awardList[idx].teams.includes(newTeam)) {
+ setAwardList([...awardList]);
+ return;
+ }
+ awardList[idx].teams[teamidx] = newTeam;
+ setAwardList([...awardList]);
+ };
+ const removeTeam = (idx: number, teamidx: number) => {
+ awardList[idx].teams.splice(teamidx, 1);
+ setAwardList([...awardList]);
+ };
+
+ const addAward = (e: React.MouseEvent) => {
+ e.preventDefault();
+ const input = document.getElementById('newAwardInput') as HTMLInputElement;
+ const val = input.value;
+ if (val === '') return;
+ input.value = '';
+ setAwardList([...awardList, { award: val, teams: [] }]);
+ };
+
+ const addAwardEnter = (e: React.KeyboardEvent) => {
+ e.preventDefault();
+ if (e.key !== 'Enter') return;
+ const input = document.getElementById('newAwardInput') as HTMLInputElement;
+ const val = input.value;
+ if (val === '') return;
+ input.value = '';
+ setAwardList([...awardList, { award: val, teams: [] }]);
+ };
+
+ const reorderAwardList = (target: HTMLElement) => {
+ const key = target ? parseInt(target.getAttribute('id') || '0') - 1 : -2;
+ const draggingKey = dragging.current
+ ? parseInt(dragging.current.getAttribute('id') || '0') - 1
+ : -2;
+
+ if (key === -2 || draggingKey === -2 || key === draggingKey) return;
+ const newAwardlist: awardType[] = [];
+ awardList.forEach((award, idx) => {
+ if (key === -1 && idx === 0) newAwardlist.push(awardList[draggingKey]);
+ if (idx !== draggingKey) newAwardlist.push(awardList[idx]);
+ if (idx === key && key !== -1) {
+ newAwardlist.push(awardList[draggingKey]);
+ }
+ });
+ setAwardList(newAwardlist);
+ };
+
+ const removeAward = (e: React.MouseEvent) => {
+ e.preventDefault();
+ const target = (e.target as HTMLElement).closest('li');
+ if (target === null) return;
+ const idx = parseInt(target.getAttribute('id') || '0') - 1;
+ if (idx === -1) return;
+ setAwardList(awardList.filter((_, i) => i !== idx));
+ };
+
+ let modifying_award_div: HTMLDivElement | null = null;
+ let modifying_award_p: HTMLParagraphElement | null = null;
+
+ const startModifyAward = (e: Event) => {
+ e.preventDefault();
+ const target = e.target as HTMLParagraphElement;
+ if (target === null) return;
+ modifying_award_div = target.closest(`.${styles.awardTitleContainer}`);
+ modifying_award_p = target.closest('p');
+ if (!modifying_award_div || !modifying_award_p) return;
+ const input = document.createElement('input');
+ input.classList.add(styles.newAwardInput);
+ input.focus();
+ input.value = modifying_award_p.innerText;
+ input.addEventListener('keydown', (e) => completeModifyAward(e));
+ input.addEventListener('blur', (e) => cancelModifyAward(e));
+ modifying_award_div.replaceChild(input, modifying_award_p);
+ };
+
+ // 수정취소
+ const cancelModifyAward = (e: FocusEvent) => {
+ e.preventDefault();
+ if (!modifying_award_div || !modifying_award_p) return;
+ modifying_award_div.replaceChild(
+ modifying_award_p,
+ modifying_award_div.children[1]
+ );
+ modifying_award_div = null;
+ modifying_award_p = null;
+ return;
+ };
+
+ // 수정완료
+ const completeModifyAward = (e: KeyboardEvent) => {
+ const target = e.target as HTMLInputElement;
+ if (!target) return;
+ modifying_award_div = target.closest(`.${styles.awardTitleContainer}`);
+ if (!modifying_award_div || !modifying_award_p) return;
+ if (e.type !== 'keydown' || e.key !== 'Enter') return;
+ const idx = parseInt(modifying_award_div?.getAttribute('id') || '-2');
+ if (idx === -2) return;
+ const newAward = target.value;
+ awardList[idx].award = newAward;
+ modifying_award_p.innerText = newAward;
+ setAwardList([...awardList]);
+ target.blur;
+ return;
+ };
+ useDraggable({
+ dragStyles,
+ parentSelector: 'form',
+ deps: awardList,
+ callback: reorderAwardList,
+ dragging: dragging,
+ });
+
+ useEffect(() => {
+ const temp = document.getElementsByClassName(styles.awardTitle);
+ const arr = Array.from(temp);
+ arr.forEach((p) => {
+ p.addEventListener('dblclick', (e) => startModifyAward(e));
+ });
+ return () => {
+ const temp = document.getElementsByClassName(styles.awardTitle);
+ const arr = Array.from(temp);
+ arr.forEach((p) => {
+ p.removeEventListener('dblclick', (e) => startModifyAward(e));
+ });
+ };
+ });
+
+ return (
+
+ );
+};
+
+export default AgendaResultForm;
diff --git a/components/agenda/Form/AnnouncementForm.tsx b/components/agenda/Form/AnnouncementForm.tsx
new file mode 100644
index 000000000..14eabd70c
--- /dev/null
+++ b/components/agenda/Form/AnnouncementForm.tsx
@@ -0,0 +1,135 @@
+import CheckboxInput from 'components/agenda/Input/CheckboxInput';
+import DescriptionInput from 'components/agenda/Input/DescriptionInput';
+import TitleInput from 'components/agenda/Input/TitleInput';
+import { useModal } from 'components/agenda/modal/useModal';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/agenda/Form/Form.module.scss';
+
+interface CreateFormProps {
+ isAdmin?: boolean;
+ data?: any;
+ stringKey: string;
+ onProceed?: () => void;
+}
+
+const SubmitAnnouncementForm = async (
+ e: React.FormEvent,
+ sendRequest: any,
+ agendaKey: string,
+ isAdmin?: boolean,
+ data?: any,
+ handleProceed?: () => void
+) => {
+ e.preventDefault();
+ const formData = new FormData(e.currentTarget);
+ const jsonData: any = {};
+
+ formData.forEach((value, key) => {
+ jsonData[key] = value;
+ });
+
+ if (isAdmin) {
+ jsonData.isShow = jsonData.isShow === 'on' ? true : false;
+ jsonData.id = data.id;
+ }
+
+ const request = isAdmin ? 'PATCH' : 'POST';
+ const url = isAdmin ? `admin/announcement` : 'announcement';
+ const params = isAdmin ? {} : { agenda_key: agendaKey };
+
+ sendRequest(
+ request,
+ url,
+ jsonData,
+ params,
+ () => {
+ handleProceed && handleProceed();
+ },
+ (error: string) => {
+ console.error(error);
+ }
+ );
+};
+
+const AnnouncementForm = ({
+ isAdmin = false,
+ data,
+ stringKey,
+ onProceed,
+}: CreateFormProps) => {
+ const { closeModal } = useModal();
+
+ const { sendRequest } = useFetchRequest();
+
+ const handleSuccess = () => {
+ if (onProceed) {
+ onProceed();
+ } else {
+ closeModal();
+ }
+ };
+
+ const oncancel = () => {
+ if (isAdmin) {
+ closeModal();
+ } else {
+ window.history.back();
+ }
+ };
+
+ return (
+
+ );
+};
+
+export default AnnouncementForm;
diff --git a/components/agenda/Form/CreateTeamForm.tsx b/components/agenda/Form/CreateTeamForm.tsx
new file mode 100644
index 000000000..44bf36264
--- /dev/null
+++ b/components/agenda/Form/CreateTeamForm.tsx
@@ -0,0 +1,223 @@
+import router from 'next/router';
+import { useEffect, useState } from 'react';
+import { SetterOrUpdater, useSetRecoilState } from 'recoil';
+import { agendaModal } from 'types/agenda/modalTypes';
+import { TeamDetailProps } from 'types/agenda/teamDetail/TeamDetailTypes';
+import { transformTeamLocation } from 'utils/agenda/transformLocation';
+import { toastState } from 'utils/recoil/toast';
+import { AgendaLocation } from 'constants/agenda/agenda';
+import CheckBoxInput from 'components/agenda/Input/CheckboxInput';
+import DescriptionInput from 'components/agenda/Input/DescriptionInput';
+import SelectInput from 'components/agenda/Input/SelectInput';
+import TitleInput from 'components/agenda/Input/TitleInput';
+import { useModal } from 'components/agenda/modal/useModal';
+import AgendaLoading from 'components/agenda/utils/AgendaLoading';
+import useAgendaTeamKey from 'hooks/agenda/useAgendaTeamKey';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/agenda/Form/Form.module.scss';
+AgendaLoading;
+const teamlocation = ['SEOUL', 'GYEONGSAN', 'NIX'];
+interface CreateTeamFormProps {
+ location: AgendaLocation | null;
+
+ isEdit?: boolean;
+ agendaKey: string;
+ /** 팀 상세 페이지 - 수정 */
+ teamDetail?: TeamDetailProps;
+ onProceed?: () => void;
+ handleConvert?: () => void;
+}
+
+const transformFormData = (formData: FormData) => {
+ const data = JSON.parse(JSON.stringify(Object.fromEntries(formData)));
+ data.teamIsPrivate = data.teamIsPrivate === 'on';
+
+ // 팀 위치 변환
+ data.teamLocation = transformTeamLocation(data.teamLocation);
+
+ // 트림 처리
+ data.teamName = data.teamName.trim();
+ data.teamContent = data.teamContent.trim();
+
+ return data;
+};
+
+const teamdataToMsg = (data: { [key: string]: string }) => {
+ const msgdata: { [key: string]: string } = {};
+ let msg = '';
+ msgdata['팀 이름'] = data.teamName;
+ msgdata['팀 설명'] = data.teamContent;
+ msgdata['팀 위치'] = data.teamLocation;
+ Object.keys(msgdata).forEach((key) => {
+ msg += `${key}: ${msgdata[key]}\n`;
+ });
+ msg += data.teamIsPrivate ? '비밀방\n' : '공개방\n';
+ return msg;
+};
+
+const SubmitTeamForm = (
+ target: React.FormEvent,
+ isEdit: boolean,
+ setSnackBar: SetterOrUpdater,
+ sendRequest: any,
+ agendaKey: string,
+ openModal: (props: agendaModal) => void,
+ teamKey?: string,
+ onProceed?: () => void,
+ handleConvert?: () => void
+) => {
+ target.preventDefault();
+
+ const formData = new FormData(target.currentTarget);
+ const data = transformFormData(formData);
+
+ //에러 스낵바 세팅
+ let errMsg = '';
+ if (data.teamContent === '') {
+ errMsg = '팀 설명을 입력해주세요.\n';
+ target.currentTarget.teamContent.focus();
+ }
+ if (data.teamName === '') {
+ errMsg = '팀 이름을 입력해주세요.\n';
+ target.currentTarget.teamName.focus();
+ }
+ if (!teamlocation.includes(data.teamLocation)) {
+ errMsg = '팀 위치를 선택해주세요.';
+ errMsg += data.teamLocation;
+ target.currentTarget.teamLocation.focus();
+ }
+
+ if (errMsg.length > 0) {
+ setSnackBar({
+ toastName: `bad request`,
+ severity: 'error',
+ message: `🔥 ${errMsg} 🔥`,
+ clicked: true,
+ });
+ return;
+ }
+
+ if (isEdit) data.teamKey = teamKey;
+
+ const requestMethod = isEdit ? 'PATCH' : 'POST';
+
+ // 모달 내용체크
+ let msg = teamdataToMsg(data);
+ msg += isEdit ? '\n팀 정보를 수정하시겠습니까?' : '\n팀을 생성하시겠습니까?';
+ openModal({
+ type: 'proceedCheck',
+ title: isEdit ? '팀 수정' : '팀 생성',
+ description: msg,
+ onProceed: () => {
+ sendRequest(
+ requestMethod,
+ 'team',
+ data,
+ { agenda_key: agendaKey },
+ (res: any) => {
+ if (isEdit) {
+ onProceed && onProceed();
+ handleConvert && handleConvert();
+ } else {
+ router.push(
+ `/agenda/detail/team?agenda_key=${agendaKey}&team_key=${res.teamKey}`
+ );
+ }
+ },
+ (err: string) => {
+ console.error(err);
+ }
+ );
+ },
+ });
+};
+
+const CreateTeamForm = ({
+ location,
+ isEdit = false,
+ agendaKey,
+ teamDetail,
+ onProceed,
+ handleConvert,
+}: CreateTeamFormProps) => {
+ const sendRequest = useFetchRequest().sendRequest;
+ const teamUID = useAgendaTeamKey();
+ const { openModal } = useModal();
+ const setSnackBar = useSetRecoilState(toastState);
+ const [flag, setFlag] = useState(false);
+
+ useEffect(() => {
+ if (teamUID) {
+ // useAgendaTeamKey()로 teamUID 가져왔을 시
+ setFlag(true);
+ }
+ }, [teamUID]);
+
+ if (!flag) {
+ return ) => {
+ SubmitTeamForm(
+ e,
+ isEdit,
+ setSnackBar,
+ sendRequest,
+ agendaKey,
+ openModal,
+ teamUID as string,
+ onProceed,
+ handleConvert
+ );
+ };
+
+ return (
+
+ );
+};
+
+export default CreateTeamForm;
diff --git a/components/agenda/Form/ModifyAgendaForm.tsx b/components/agenda/Form/ModifyAgendaForm.tsx
new file mode 100644
index 000000000..3a73f7771
--- /dev/null
+++ b/components/agenda/Form/ModifyAgendaForm.tsx
@@ -0,0 +1,48 @@
+import AgendaForm from './AgendaForm';
+
+interface ModifyAgendaFormProps {
+ data: {
+ agendaId: number;
+ agendaKey: string;
+ agendaTitle: string;
+ agendaContent: string;
+ agendaDeadLine: string;
+ agendaStartTime: string;
+ agendaEndTime: string;
+ agendaCurrentTeam: number;
+ agendaMinTeam: number;
+ agendaMaxTeam: number;
+ agendaMinPeople: number;
+ agendaMaxPeople: number;
+ agendaLocation: string;
+ isRanking: boolean;
+ isOfficial: boolean;
+ agendaStatus: string;
+ agendaPosterUrl: string;
+ };
+ stringKey: string;
+ isAdmin?: boolean;
+ onProceed?: () => void;
+}
+
+const ModifyAgendaForm = ({
+ isAdmin,
+ data,
+ stringKey,
+ onProceed,
+}: ModifyAgendaFormProps) => {
+ // onProceed를 전달하지 않으면 기본적으로 모달 닫기 실행
+ return (
+ <>
+ ,
+ isEdit: boolean,
+ openModal: (props: agendaModal) => void,
+ setSnackBar: SetterOrUpdater,
+ router: NextRouter,
+ isAdmin?: boolean,
+ stringKey?: string,
+ onProceed?: () => void
+) => {
+ e.preventDefault();
+
+ const data = new FormData(e.target as HTMLFormElement);
+ if (!data) return;
+
+ let errMsg = '';
+ const formatDate = (key: string) => {
+ const value = data.get(key);
+ if (value) {
+ data.set(key, `${value}:00`);
+ }
+ };
+
+ formatDate('agendaStartTime');
+ formatDate('agendaEndTime');
+ formatDate('agendaDeadLine');
+
+ const isRankingKey = data.get('agendaStatus')
+ ? 'isRanking'
+ : 'agendaIsRanking';
+ data.set(isRankingKey, data.get(isRankingKey) === 'on' ? 'true' : 'false');
+
+ if (data.get('isSolo') === 'on') {
+ data.set('agendaMaxPeople', '1');
+ data.set('agendaMinPeople', '1');
+ }
+ data.delete('isSolo');
+
+ // 에러 체크: 위에서부터 보이도록
+ if (data.get('agendaLocation') === '선택해주세요') {
+ errMsg = '개최지를 선택해주세요.\n';
+ document.querySelector('select')?.focus();
+ }
+ const poster = data.get('agendaPoster') as File;
+ if (poster.size > 1024 * 1024) {
+ errMsg = '파일 사이즈가 너무 큽니다.\n';
+ document.getElementById('agendaPoster')?.focus();
+ }
+ if (
+ poster.size != 0 &&
+ poster.type !== 'image/jpeg' &&
+ poster.type !== 'image/jpg'
+ ) {
+ errMsg = 'jpg, jpeg 파일만 업로드 가능합니다.\n';
+ document.getElementById('agendaPoster')?.focus();
+ }
+ if (document.getElementsByClassName('error_text').length > 0) {
+ errMsg = '입력값을 확인해주세요.\n';
+ const err = document.querySelector('input[error]') as HTMLInputElement;
+ err?.focus();
+ }
+ if (data.get('agendaContent') === '') {
+ errMsg = '행사 내용이 필요합니다.\n';
+ document.getElementById('agendaContent')?.focus();
+ }
+ if (data.get('agendaTitle') === '') {
+ errMsg = '행사 제목이 필요합니다.\n';
+ document.getElementById('agendaTitle')?.focus();
+ }
+
+ // 에러 메세지 확인
+ if (errMsg.length > 0) {
+ setSnackBar({
+ toastName: `bad request`,
+ severity: 'error',
+ message: `🔥 ${errMsg} 🔥`,
+ clicked: true,
+ });
+ return;
+ }
+
+ // URL 설정
+ let url = '/request';
+ if (stringKey) {
+ url = `/admin/request?agenda_key=${stringKey}`;
+ if (isAdmin) {
+ data.set(
+ 'isOfficial',
+ data.get('isOfficial') === 'on' ? 'true' : 'false'
+ );
+ }
+ }
+
+ // 모달 확인
+ const msg = agendadataToMsg(data, isEdit);
+ openModal({
+ type: 'proceedCheck',
+ title: isEdit ? '행사 수정' : '행사 생성',
+ description: msg,
+ onProceed: () => {
+ // 데이터 전송
+ instanceInAgenda
+ .post(url, data)
+ .then((res) => {
+ if (res.status === 204 || res.status === 200)
+ onProceed && onProceed();
+ if (!isEdit) {
+ router.push(`/agenda/detail?agenda_key=${res.data.agendaKey}`);
+ }
+ })
+ .catch((err) => {
+ console.error(err);
+ });
+ },
+ });
+};
+
+export default SubmitAgendaForm;
diff --git a/components/agenda/Form/TicketForm.tsx b/components/agenda/Form/TicketForm.tsx
new file mode 100644
index 000000000..f2092536c
--- /dev/null
+++ b/components/agenda/Form/TicketForm.tsx
@@ -0,0 +1,95 @@
+import { useState } from 'react';
+import { useSetRecoilState } from 'recoil';
+import { toastState } from 'utils/recoil/toast';
+import AgendaSelect from 'components/agenda/Input/AgendaSelect';
+import { useModal } from 'components/agenda/modal/useModal';
+import useFetchGet from 'hooks/agenda/useFetchGet';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/agenda/Form/Form.module.scss';
+
+interface userFormProps {
+ stringKey: string;
+}
+
+const TicketForm = ({ stringKey }: userFormProps) => {
+ const { closeModal } = useModal();
+ const sendRequest = useFetchRequest().sendRequest;
+ const agendaList = useFetchGet({ url: 'admin/list' }).data || [];
+ const [selectedAgendaKey, setSelectedAgendaKey] = useState('');
+
+ const handleSelectChange = (e: { target: { value: any } }) => {
+ setSelectedAgendaKey(e.target.value);
+ };
+ const setSnackbar = useSetRecoilState(toastState);
+
+ const handleSubmit = async (e: React.FormEvent) => {
+ e.preventDefault();
+ const formData = new FormData(e.currentTarget);
+ const jsonData: any = {};
+
+ formData.forEach((value, key) => {
+ jsonData[key] = value;
+ });
+
+ jsonData.issuedFromKey = selectedAgendaKey;
+
+ sendRequest(
+ 'POST',
+ 'admin/ticket',
+ jsonData,
+ { intraId: stringKey },
+ () => {
+ closeModal();
+ },
+ (error: string) => {
+ setSnackbar({
+ toastName: `response error`,
+ severity: 'error',
+ message: `🔥 ${error} 🔥`,
+ clicked: true,
+ });
+ }
+ );
+ };
+
+ return (
+
+ );
+};
+
+export default TicketForm;
diff --git a/components/agenda/Form/userForm.tsx b/components/agenda/Form/userForm.tsx
new file mode 100644
index 000000000..1623c8b0f
--- /dev/null
+++ b/components/agenda/Form/userForm.tsx
@@ -0,0 +1,108 @@
+import DescriptionInput from 'components/agenda/Input/DescriptionInput';
+import SelectInput from 'components/agenda/Input/SelectInput';
+import TitleInput from 'components/agenda/Input/TitleInput';
+import { useModal } from 'components/agenda/modal/useModal';
+import useFetchGet from 'hooks/agenda/useFetchGet';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/agenda/Form/Form.module.scss';
+
+interface userFormProps {
+ stringKey: string;
+}
+interface dataType {
+ userIntraId: string;
+ userContent: string;
+ userGithub: string;
+ userLocation: string;
+}
+
+const SubmitUserForm = async (
+ e: React.FormEvent,
+ sendRequest: any,
+ data: any,
+ handleProceed?: () => void
+) => {
+ e.preventDefault();
+ const formData = new FormData(e.currentTarget);
+ const jsonData: any = {};
+
+ formData.forEach((value, key) => {
+ jsonData[key] = value;
+ });
+
+ sendRequest(
+ 'PATCH',
+ 'admin/profile',
+ jsonData,
+ { intraId: data.userIntraId },
+ () => {
+ handleProceed && handleProceed();
+ },
+ (error: string) => {
+ console.error(error);
+ }
+ );
+};
+
+const UserForm = ({ stringKey }: userFormProps) => {
+ const { closeModal } = useModal();
+ const sendRequest = useFetchRequest().sendRequest;
+
+ const { data }: { data: dataType | null } = useFetchGet({
+ url: `profile/${stringKey}`,
+ });
+
+ if (!data) {
+ return (0);
+
+ return (
+ <>
+ {!agendaList || !agendaList.length ? (
+ ({ url: '/profile/current/list' })?.data ||
+ [];
+ return (
+ (
+ selected && selected != message ? styles.selected : styles.unselected
+ );
+ const selectedValueRef = useRef(selected ? selected : '');
+
+ message = message ? message : '선택해주세요';
+ selected = selected ? selected : message;
+
+ function changeState(e: React.ChangeEvent) {
+ if (e.target.value === selectedValueRef.current) {
+ // 이전 값과 같을 경우
+ return isSelected === styles.selected ? true : false;
+ }
+ selectedValueRef.current = e.target.value;
+ if (selectedValueRef.current === message) {
+ // 선택값이 선택하지 않은 값일 경우
+ setIsSelected(styles.unselected);
+ return false;
+ } else {
+ setIsSelected(styles.selected);
+ return true;
+ }
+ }
+
+ return (
+ >;
+ resetOpenMenuBarState: () => void;
+}
+
+export const HeaderContext = createContext(null);
+
+export default function AgendaHeader() {
+ const [menu, setMenu] = useState(false);
+ const resetMenuHandler = () => {
+ setMenu(false);
+ };
+
+ const HeaderState: HeaderContextState = {
+ openMenuState: menu,
+ setOpenMenuBarState: setMenu,
+ resetOpenMenuBarState: resetMenuHandler,
+ };
+
+ return (
+
+
+ );
+}
diff --git a/components/agenda/Layout/AgendaUserLayout.tsx b/components/agenda/Layout/AgendaUserLayout.tsx
new file mode 100644
index 000000000..c3c380c3d
--- /dev/null
+++ b/components/agenda/Layout/AgendaUserLayout.tsx
@@ -0,0 +1,11 @@
+import styles from 'styles/agenda/Layout/Layout.module.scss';
+
+const AgendaUserLayout = ({ children }: { children: React.ReactNode }) => {
+ return (
+ (HeaderContext)
+ ?.resetOpenMenuBarState ||
+ function () {
+ console.log('resetOpenMenuBarState is not defined'); //error
+ };
+
+ return (
+
+ ) => {
+ const { name, value } = e.target;
+ setProfileData((prevProfile) => ({
+ ...prevProfile,
+ [name]: value,
+ }));
+ };
+
+ const { sendRequest: editProfile } = useFetchRequest();
+ // 프로필 수정 - 수정하기 / PATCH 요청
+ const handleEdit = async () => {
+ editProfile(
+ 'PATCH',
+ 'profile',
+ {
+ userContent: profileData.userContent,
+ userGithub: profileData.userGithub,
+ },
+ {},
+ () => {
+ getProfileData();
+ handleFlip();
+ },
+ (error: string) => {
+ console.error(error);
+ }
+ );
+ };
+
+ // 프로필 수정 - 취소하기
+ const handleCancel = () => {
+ setProfileData(initialProfileData);
+ handleFlip();
+ };
+
+ return (
+ ({ url: '/ticket' });
+ const { openModal } = useModal();
+
+ return (
+ <>
+ {type === 'page' ? (
+ (TABS.DESCRIPTION);
+ return (
+ <>
+ (0);
+
+ const { content, PagaNationElementProps } = usePageNation({
+ url: `/announcement`,
+ params: { agenda_key: agendaKey },
+ size: 5,
+ isReady: Boolean(agendaKey),
+ });
+ const newHandler = (page: number) => {
+ setSelected(0);
+ return PagaNationElementProps.pageChangeHandler(page);
+ };
+
+ if (!agendaKey || !content) {
+ return (
+ ({
+ url: `team/open/list`,
+ params: { agenda_key: agendaKey },
+ isReady: Boolean(agendaKey),
+ });
+
+ const {
+ content: confirmedTeams,
+ PagaNationElementProps: confirmedTeamPageNationProps,
+ } = usePageNation({
+ url: `team/confirm/list`,
+ params: { agenda_key: agendaKey },
+ isReady: Boolean(agendaKey),
+ });
+
+ const noParticipants = (
+ ({
+ url: `team/confirm/list`,
+ params: { agenda_key: agendaKey },
+ isReady: Boolean(agendaKey),
+ });
+
+ const curPeople = participants ? participants.length : 0;
+
+ if (!agendaKey || !participants) {
+ return ) => void;
+}) => {
+ return (
+
+ );
+};
+
+const ShareBtn = ({
+ onClick,
+}: {
+ onClick: (e: React.MouseEvent) => void;
+}) => {
+ return (
+
+ );
+};
+
+const BackwardBtn = ({
+ onClick,
+}: {
+ onClick: (e: React.MouseEvent) => void;
+}) => {
+ return (
+
+ );
+};
+
+const ForwardBtn = ({
+ onClick,
+}: {
+ onClick: (e: React.MouseEvent) => void;
+}) => {
+ return (
+
+ );
+};
+
+const AddElementBtn = ({
+ onClick,
+}: {
+ onClick: (e: React.MouseEvent) => void;
+}) => {
+ return (
+
+ );
+};
+
+const RemoveElementBtn = ({
+ onClick,
+}: {
+ onClick: (e: React.MouseEvent) => void;
+}) => {
+ return (
+
+ );
+};
+
+const DragBtn = ({
+ onClick,
+}: {
+ onClick: (e: React.MouseEvent) => void;
+}) => {
+ return (
+
+ );
+};
+
+export {
+ CancelBtn,
+ ShareBtn,
+ BackwardBtn,
+ ForwardBtn,
+ AddElementBtn,
+ RemoveElementBtn,
+ DragBtn,
+};
diff --git a/components/agenda/button/FormButton.tsx b/components/agenda/button/FormButton.tsx
new file mode 100644
index 000000000..f14f8893c
--- /dev/null
+++ b/components/agenda/button/FormButton.tsx
@@ -0,0 +1,31 @@
+import styles from 'styles/agenda/button/SubmitInputButton.module.scss';
+
+interface formButtonProps {
+ name?: string;
+ submit?: boolean;
+ label: string;
+ onClick?: (e: React.MouseEvent) => void;
+ rest?: Record | undefined;
+}
+
+const FormBtn = ({
+ name,
+ label,
+ submit,
+ onClick,
+ ...rest
+}: formButtonProps) => {
+ return (
+
+ );
+};
+
+export default FormBtn;
diff --git a/components/agenda/button/TabButton.tsx b/components/agenda/button/TabButton.tsx
new file mode 100644
index 000000000..5550643ef
--- /dev/null
+++ b/components/agenda/button/TabButton.tsx
@@ -0,0 +1,13 @@
+import { TabButtonProps } from 'types/agenda/button/tabButtonTypes';
+import styles from 'styles/agenda/button/TabButton.module.scss';
+
+export default function TabButton({ text, isActive, onClick }: TabButtonProps) {
+ return (
+
+ );
+}
diff --git a/components/agenda/button/TabButtons.tsx b/components/agenda/button/TabButtons.tsx
new file mode 100644
index 000000000..2872e64e0
--- /dev/null
+++ b/components/agenda/button/TabButtons.tsx
@@ -0,0 +1,22 @@
+import { TabButtonsProps } from 'types/agenda/button/tabButtonTypes';
+import TabButton from 'components/agenda/button/TabButton';
+import styles from 'styles/agenda/agendaDetail/AgendaTab.module.scss';
+
+export default function TabButtons({
+ tabs,
+ activeTab,
+ onTabClick,
+}: TabButtonsProps) {
+ return (
+ ;
+}
+
+const ModifyModal: React.FC = (props) => {
+ const {
+ title,
+ description,
+ FormComponent,
+ data,
+ isAdmin,
+ stringKey,
+ onProceed,
+ } = props;
+
+ return (
+ <>
+ = ({ tagName }) => {
+ const tagBackground = styles[tagName] || styles.default;
+
+ return (
+ = {
+ [AgendaStatus.CANCEL]: '취소',
+ [AgendaStatus.OPEN]: '모집중',
+ [AgendaStatus.CONFIRM]: '진행중',
+ [AgendaStatus.FINISH]: '완료',
+ };
+ const LocationToTagName: Record = {
+ [AgendaLocation.SEOUL]: '서울',
+ [AgendaLocation.GYEONGSAN]: '경산',
+ [AgendaLocation.MIX]: '전국',
+ };
+
+ const status = data.agendaStatus ? statusToTagName[data.agendaStatus] : '';
+ const location = LocationToTagName[data.agendaLocation];
+ const tags = [
+ data.isOfficial ? '공식' : '비공식',
+ data.agendaMaxPeople === 1 ? '개인' : '팀',
+ data.isRanking ? '대회' : null,
+ location,
+ ].filter(Boolean);
+ status && tags.push(status);
+
+ return (
+ ) => {
+ setIsHovered(true);
+ setMousePosition({
+ x: e.clientX,
+ y: e.clientY,
+ });
+ };
+
+ const handleMouseLeave = () => {
+ setIsHovered(false);
+ };
+
+ return src ? (
+
-
+
42GG
+
+ );
+}
diff --git a/components/admin/agenda/agendaList/AgendaTable.tsx b/components/admin/agenda/agendaList/AgendaTable.tsx
new file mode 100644
index 000000000..03401670f
--- /dev/null
+++ b/components/admin/agenda/agendaList/AgendaTable.tsx
@@ -0,0 +1,289 @@
+import { useRouter } from 'next/router';
+import { useCallback, useEffect, useState } from 'react';
+import { useSetRecoilState } from 'recoil';
+import {
+ Paper,
+ Table,
+ TableBody,
+ TableCell,
+ TableContainer,
+ TableRow,
+} from '@mui/material';
+import { instanceInAgenda } from 'utils/axios';
+import { dateToString } from 'utils/handleTime';
+import { toastState } from 'utils/recoil/toast';
+import { agendaTableFormat } from 'constants/admin/agendaTable';
+import { AgendaStatus } from 'constants/agenda/agenda';
+import { NoContent } from 'components/admin/agenda/utils';
+import { AdminAgendaTableHead } from 'components/admin/takgu/common/AdminTable';
+import ModifyAgendaForm from 'components/agenda/Form/ModifyAgendaForm';
+import { useModal } from 'components/agenda/modal/useModal';
+import PageNation from 'components/Pagination';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/admin/agenda/agendaList/AgendaTable.module.scss';
+
+const itemsPerPage = 10;
+
+const tableTitle: { [key: string]: string } = {
+ agendaId: 'Id',
+ // agendaPosterUrl:'포스터',
+ agendaTitle: '제목',
+ agendaDeadLine: '모집 마감일',
+ agendaStartTime: '시작 시간',
+ agendaEndTime: '종료 시간',
+ // agendaCurrentTeam: '참가 팀',
+ // agendaMaxTeam: '최대 팀',
+ // agendaMinPeople: '최소 인원',
+ // agendaMaxPeople: '최대 인원',
+ agendaLocation: '장소',
+ // agendaKey: '아젠다 ID',
+ // isRanking: '랭킹 여부',
+ isOfficial: '공식 여부',
+ agendaStatus: '상태',
+
+ // ---------------------
+ etc: '기타',
+};
+
+export interface IAgenda {
+ agendaId: number;
+ agendaPosterUrl: string;
+ agendaTitle: string;
+ agendaDeadLine: string;
+ agendaStartTime: string;
+ agendaEndTime: string;
+ agendaCurrentTeam: number;
+ agendaMaxTeam: number;
+ agendaMinPeople: number;
+ agendaMaxPeople: number;
+ agendaLocation: string;
+ agendaKey: string;
+ isRanking: boolean;
+ isOfficial: boolean;
+ agendaStatus: string;
+}
+
+export interface IAgendaTable {
+ agendaList: IAgenda[];
+ totalPage: number;
+ currentPage: number;
+}
+
+interface AgendaTableProps {
+ status?: AgendaStatus;
+ isOfficial?: boolean;
+}
+
+export default function AgendaTable({ status, isOfficial }: AgendaTableProps) {
+ const router = useRouter();
+ const { sendRequest } = useFetchRequest();
+
+ const [agendaInfo, setAgendaInfo] = useState-
+ {tabContents.map((content) => (
+
- setTabIdx(content.contentId)} + > + {content.contentName} + + ))} +
{child}
+
+
+
+
+
+
+ );
+}
diff --git a/components/admin/agenda/announcements/AnnouncementTable.tsx b/components/admin/agenda/announcements/AnnouncementTable.tsx
new file mode 100644
index 000000000..9db4ee1cf
--- /dev/null
+++ b/components/admin/agenda/announcements/AnnouncementTable.tsx
@@ -0,0 +1,212 @@
+import { useRouter } from 'next/router';
+import { useCallback, useEffect, useState } from 'react';
+import {
+ MenuItem,
+ Paper,
+ Select,
+ SelectChangeEvent,
+ Table,
+ TableBody,
+ TableCell,
+ TableContainer,
+ TableRow,
+} from '@mui/material';
+import { instance } from 'utils/axios';
+import { dateToString } from 'utils/handleTime';
+import { agendaTableFormat } from 'constants/admin/agendaTable';
+import { NoContent } from 'components/admin/agenda/utils';
+import { AdminAgendaTableHead } from 'components/admin/takgu/common/AdminTable';
+import AnnouncementForm from 'components/agenda/Form/AnnouncementForm';
+import { useModal } from 'components/agenda/modal/useModal';
+import PageNation from 'components/Pagination';
+import useFetchGet from 'hooks/agenda/useFetchGet';
+import styles from 'styles/admin/agenda/agendaList/AgendaTable.module.scss';
+
+const itemsPerPage = 10;
+
+const tableTitle: { [key: string]: string } = {
+ id: 'ID',
+ title: '제목',
+ content: '내용',
+ isShow: '공개 여부',
+ createdAt: '생성일',
+ etc: '기타',
+};
+
+export interface IAnnouncement {
+ id: number;
+ title: string;
+ content: string;
+ isShow: boolean;
+ createdAt: string;
+}
+
+export interface IAnnouncementTable {
+ announcementList: IAnnouncement[];
+ totalPage: number;
+ currentPage: number;
+}
+
+export default function AnnouncementTable() {
+ const router = useRouter();
+ const { agendaKey } = router.query;
+ const { openModal, closeModal } = useModal();
+
+ const [announcementInfo, setAnnouncementInfo] = useState
+ 아젠다 관리
+
+
+ {
+ setCurrentPage(pageNumber);
+ }}
+ />
+
+
+
+
+
+
+
+ );
+}
diff --git a/components/admin/agenda/teamList/TeamTable.tsx b/components/admin/agenda/teamList/TeamTable.tsx
new file mode 100644
index 000000000..57eab45af
--- /dev/null
+++ b/components/admin/agenda/teamList/TeamTable.tsx
@@ -0,0 +1,247 @@
+import { useRouter } from 'next/router';
+import { useCallback, useEffect, useState } from 'react';
+import { useSetRecoilState } from 'recoil';
+import {
+ MenuItem,
+ Paper,
+ Select,
+ Table,
+ TableBody,
+ TableCell,
+ TableContainer,
+ TableRow,
+} from '@mui/material';
+import { instance } from 'utils/axios';
+import { toastState } from 'utils/recoil/toast';
+import { agendaTableFormat } from 'constants/admin/agendaTable';
+import { TeamStatus } from 'constants/agenda/agenda';
+import { NoContent } from 'components/admin/agenda/utils';
+import { AdminAgendaTableHead } from 'components/admin/takgu/common/AdminTable';
+import PageNation from 'components/Pagination';
+import useFetchGet from 'hooks/agenda/useFetchGet';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/admin/agenda/agendaList/AgendaTable.module.scss';
+
+const itemsPerPage = 10; // 한 페이지에 보여줄 항목 수
+
+const tableTitle: { [key: string]: string } = {
+ teamName: '팀 이름',
+ teamLeaderIntraId: '팀장',
+ teamMateCount: '팀원 수',
+ teamIsPrivate: '공개 여부',
+ teamAward: '상',
+ teamAwardPriority: '등수',
+ teamStatus: '상태',
+ teamLocation: '위치',
+ etc: '기타',
+};
+
+export interface ITeam {
+ teamKey: string;
+ teamName: string;
+ teamLeaderIntraId: string;
+ teamMateCount: number;
+ teamIsPrivate: boolean;
+ teamAward: string;
+ teamAwardPriority: number;
+ teamStatus: string;
+ teamLocation: string;
+ coalitions: string[];
+}
+
+export interface ITeamTable {
+ teamList: ITeam[];
+ totalPage: number;
+ currentPage: number;
+}
+
+export default function TeamTable() {
+ const router = useRouter();
+ const { agendaKey } = router.query;
+ const sendRequest = useFetchRequest().sendRequest;
+
+ const [teamInfo, setTeamInfo] = useState
+ 공지사항 관리
+
+
+ {selectedAgendaKey ? (
+ <>
+
+ {
+ setCurrentPage(pageNumber);
+ }}
+ />
+
+
+ ) : (
+ 아젠다를 선택해주세요.
+ )}
+
+
+
+
+
+
+ );
+}
diff --git a/components/admin/agenda/ticket/TicketTable.tsx b/components/admin/agenda/ticket/TicketTable.tsx
new file mode 100644
index 000000000..09e18d29a
--- /dev/null
+++ b/components/admin/agenda/ticket/TicketTable.tsx
@@ -0,0 +1,157 @@
+import { useCallback, useEffect, useState } from 'react';
+import {
+ Paper,
+ Table,
+ TableBody,
+ TableCell,
+ TableContainer,
+ TableRow,
+} from '@mui/material';
+import { ITicket } from 'types/agenda/ticket/ticketTypes';
+import { instance } from 'utils/axios';
+import { agendaTableFormat } from 'constants/admin/agendaTable';
+import { NoContent } from 'components/admin/agenda/utils';
+import { AdminAgendaTableHead } from 'components/admin/takgu/common/AdminTable';
+import AdminTicketForm from 'components/agenda/Form/AdminTicketForm';
+import { useModal } from 'components/agenda/modal/useModal';
+import PageNation from 'components/Pagination';
+import styles from 'styles/admin/agenda/agendaList/AgendaTable.module.scss';
+
+const itemsPerPage = 10; // 한 페이지에 보여줄 항목 수
+
+const tableTitle: { [key: string]: string } = {
+ ticketId: '티켓 ID',
+ createdAt: '발급 시간',
+ issuedFrom: '발급처',
+ usedTo: '사용처',
+ isApproved: '승인 여부',
+ approvedAt: '승인 시간',
+ isUsed: '사용 여부',
+ usedAt: '사용 시간',
+ etc: '기타',
+};
+
+export interface ITicketTable {
+ ticketList: ITicket[];
+ totalPage: number;
+ currentPage: number;
+}
+
+interface TicketTableProps {
+ intraId: string;
+}
+
+const TicketTable = ({ intraId }: TicketTableProps) => {
+ const [ticketInfo, setTicketInfo] = useState
+ 팀 관리
+
+
+ {selectedAgendaKey ? (
+ <>
+
+ {
+ setCurrentPage(pageNumber);
+ }}
+ />
+
+
+ ) : (
+ 아젠다를 선택해주세요.
+ )}
+
+
+
+
+
+
+ );
+};
+
+export default TicketTable;
diff --git a/components/admin/agenda/users/UserTable.tsx b/components/admin/agenda/users/UserTable.tsx
new file mode 100644
index 000000000..dde4b53bd
--- /dev/null
+++ b/components/admin/agenda/users/UserTable.tsx
@@ -0,0 +1,172 @@
+import router from 'next/router';
+import { useCallback, useEffect, useState } from 'react';
+import {
+ Paper,
+ Table,
+ TableBody,
+ TableCell,
+ TableContainer,
+ TableRow,
+} from '@mui/material';
+import { IUser, IUserTable } from 'types/admin/takgu/adminUserTypes';
+import { instanceInManage } from 'utils/axios';
+import { agendaTableFormat } from 'constants/admin/agendaTable';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
+import {
+ AdminAgendaTableHead,
+ AdminEmptyItem,
+} from 'components/admin/takgu/common/AdminTable';
+import TicketForm from 'components/agenda/Form/TicketForm';
+import UserForm from 'components/agenda/Form/userForm';
+import { useModal } from 'components/agenda/modal/useModal';
+import PageNation from 'components/Pagination';
+import styles from 'styles/admin/takgu/users/UserManagementTable.module.scss';
+
+const tableTitle: { [key: string]: string } = {
+ id: 'ID',
+ roleType: '권한',
+ intraId: 'Intra ID',
+ etc: '기타',
+};
+
+export default function UserTable() {
+ const [userManagements, setUserManagements] = useState
+ 티켓 관리
+
+
+ {
+ setCurrentPage(pageNumber);
+ getTicketList();
+ }}
+ />
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/components/admin/agenda/utils.tsx b/components/admin/agenda/utils.tsx
new file mode 100644
index 000000000..1646cfd2d
--- /dev/null
+++ b/components/admin/agenda/utils.tsx
@@ -0,0 +1,16 @@
+import { TableCell, TableRow } from '@mui/material';
+
+interface INoContent {
+ content: string;
+ col: number;
+}
+
+export function NoContent({ content, col }: INoContent) {
+ return (
+
+ 유저 관리
+
+
+ {
+ setCurrentPage(pageNumber);
+ }}
+ />
+
+ {party.name || teamNameFallback}
@@ -89,7 +89,7 @@ function TournamentEditMatchParty({
{party.name}
diff --git a/components/admin/tournament/TournamentList.tsx b/components/admin/takgu/tournament/TournamentList.tsx
similarity index 97%
rename from components/admin/tournament/TournamentList.tsx
rename to components/admin/takgu/tournament/TournamentList.tsx
index 9d90fd911..ffa3245ef 100644
--- a/components/admin/tournament/TournamentList.tsx
+++ b/components/admin/takgu/tournament/TournamentList.tsx
@@ -18,18 +18,18 @@ import {
ITournament,
ITournamentEditInfo,
ITournamentTable,
-} from 'types/admin/adminTournamentTypes';
+} from 'types/admin/takgu/adminTournamentTypes';
import { instance, instanceInManage } from 'utils/axios';
import { dateToDateTimeLocalString, dateToStringShort } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/tournament/TournamentList.module.scss';
+import styles from 'styles/admin/takgu/tournament/TournamentList.module.scss';
const tableTitle: { [key: string]: string } = {
title: '토너먼트 이름',
diff --git a/components/admin/tournament/TournamentModalPreview.tsx b/components/admin/takgu/tournament/TournamentModalPreview.tsx
similarity index 87%
rename from components/admin/tournament/TournamentModalPreview.tsx
rename to components/admin/takgu/tournament/TournamentModalPreview.tsx
index 33afcfec5..e4574aa23 100644
--- a/components/admin/tournament/TournamentModalPreview.tsx
+++ b/components/admin/takgu/tournament/TournamentModalPreview.tsx
@@ -1,10 +1,10 @@
import dynamic from 'next/dynamic';
import { MdPeopleAlt } from 'react-icons/md';
-import { ITournamentEditInfo } from 'types/admin/adminTournamentTypes';
-import { QUILL_FORMATS } from 'types/quillTypes';
+import { ITournamentEditInfo } from 'types/admin/takgu/adminTournamentTypes';
+import { QUILL_FORMATS } from 'types/takgu/quillTypes';
import { dateToString } from 'utils/handleTime';
import DynamicQuill from 'components/DynamicQuill';
-import styles from 'styles/admin/tournament/TournamentModalPreview.module.scss';
+import styles from 'styles/admin/takgu/tournament/TournamentModalPreview.module.scss';
interface TournamentModalPreviewProps {
tournamentEditInfo: ITournamentEditInfo;
diff --git a/components/admin/usageHistory/MegaphoneList.tsx b/components/admin/takgu/usageHistory/MegaphoneList.tsx
similarity index 94%
rename from components/admin/usageHistory/MegaphoneList.tsx
rename to components/admin/takgu/usageHistory/MegaphoneList.tsx
index 052304a01..7d691039b 100644
--- a/components/admin/usageHistory/MegaphoneList.tsx
+++ b/components/admin/takgu/usageHistory/MegaphoneList.tsx
@@ -8,20 +8,23 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { Imegaphone, ImegaphoneTable } from 'types/admin/adminReceiptType';
+import {
+ Imegaphone,
+ ImegaphoneTable,
+} from 'types/admin/takgu/adminReceiptType';
import { instanceInManage } from 'utils/axios';
import { getFormattedDateToString } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
import {
AdminContent,
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/usageHistory/MegaphoneList.module.scss';
+import styles from 'styles/admin/takgu/usageHistory/MegaphoneList.module.scss';
const tableTitle: { [key: string]: string } = {
megaphoneId: 'ID',
diff --git a/components/admin/usageHistory/MenuTab.tsx b/components/admin/takgu/usageHistory/MenuTab.tsx
similarity index 77%
rename from components/admin/usageHistory/MenuTab.tsx
rename to components/admin/takgu/usageHistory/MenuTab.tsx
index b5a7c08c2..668183029 100644
--- a/components/admin/usageHistory/MenuTab.tsx
+++ b/components/admin/takgu/usageHistory/MenuTab.tsx
@@ -1,9 +1,9 @@
import { useEffect, useState } from 'react';
-import MegaphoneList from 'components/admin/usageHistory/MegaphoneList';
-import ProfileDeleteHistoryList from 'components/admin/usageHistory/ProfileDeleteHistoryList';
-import ProfileList from 'components/admin/usageHistory/ProfileList';
-import ProfileListCurrent from 'components/admin/usageHistory/ProfileListCurrent';
-import styles from 'styles/admin/usageHistory/MenuTab.module.scss';
+import MegaphoneList from 'components/admin/takgu/usageHistory/MegaphoneList';
+import ProfileDeleteHistoryList from 'components/admin/takgu/usageHistory/ProfileDeleteHistoryList';
+import ProfileList from 'components/admin/takgu/usageHistory/ProfileList';
+import ProfileListCurrent from 'components/admin/takgu/usageHistory/ProfileListCurrent';
+import styles from 'styles/admin/takgu/usageHistory/MenuTab.module.scss';
function MenuTab() {
const [tabIdx, setTabIdx] = useState(0);
diff --git a/components/admin/usageHistory/ProfileDeleteHistoryList.tsx b/components/admin/takgu/usageHistory/ProfileDeleteHistoryList.tsx
similarity index 95%
rename from components/admin/usageHistory/ProfileDeleteHistoryList.tsx
rename to components/admin/takgu/usageHistory/ProfileDeleteHistoryList.tsx
index 2e400d24b..9cabf8b9c 100644
--- a/components/admin/usageHistory/ProfileDeleteHistoryList.tsx
+++ b/components/admin/takgu/usageHistory/ProfileDeleteHistoryList.tsx
@@ -9,18 +9,18 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { Iprofile, IprofileTable } from 'types/admin/adminReceiptType';
+import { Iprofile, IprofileTable } from 'types/admin/takgu/adminReceiptType';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/usageHistory/ProfileList.module.scss';
+import styles from 'styles/admin/takgu/usageHistory/ProfileList.module.scss';
const tableTitle: { [key: string]: string } = {
id: 'ID',
diff --git a/components/admin/usageHistory/ProfileList.tsx b/components/admin/takgu/usageHistory/ProfileList.tsx
similarity index 94%
rename from components/admin/usageHistory/ProfileList.tsx
rename to components/admin/takgu/usageHistory/ProfileList.tsx
index 8bad02d46..485fdba60 100644
--- a/components/admin/usageHistory/ProfileList.tsx
+++ b/components/admin/takgu/usageHistory/ProfileList.tsx
@@ -9,19 +9,19 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { Iprofile, IprofileTable } from 'types/admin/adminReceiptType';
+import { Iprofile, IprofileTable } from 'types/admin/takgu/adminReceiptType';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/usageHistory/ProfileList.module.scss';
+import styles from 'styles/admin/takgu/usageHistory/ProfileList.module.scss';
const tableTitle: { [key: string]: string } = {
id: 'ID',
diff --git a/components/admin/usageHistory/ProfileListCurrent.tsx b/components/admin/takgu/usageHistory/ProfileListCurrent.tsx
similarity index 93%
rename from components/admin/usageHistory/ProfileListCurrent.tsx
rename to components/admin/takgu/usageHistory/ProfileListCurrent.tsx
index a462bbd05..7dd23693f 100644
--- a/components/admin/usageHistory/ProfileListCurrent.tsx
+++ b/components/admin/takgu/usageHistory/ProfileListCurrent.tsx
@@ -9,19 +9,19 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { Iprofile, IprofileTable } from 'types/admin/adminReceiptType';
+import { Iprofile, IprofileTable } from 'types/admin/takgu/adminReceiptType';
import { instanceInManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
import {
AdminEmptyItem,
AdminTableHead,
-} from 'components/admin/common/AdminTable';
+} from 'components/admin/takgu/common/AdminTable';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/usageHistory/ProfileList.module.scss';
+import styles from 'styles/admin/takgu/usageHistory/ProfileList.module.scss';
const tableTitle: { [key: string]: string } = {
id: 'ID',
@@ -138,7 +138,7 @@ function ProfileListCurrent() {
src={
profile[columnName]
? profile[columnName]
- : '/image/fallBackSrc.jpeg'
+ : '/image/takgu/fallBackSrc.jpeg'
}
width={60}
height={60}
diff --git a/components/admin/users/UserManagementTable.tsx b/components/admin/takgu/users/UserManagementTable.tsx
similarity index 94%
rename from components/admin/users/UserManagementTable.tsx
rename to components/admin/takgu/users/UserManagementTable.tsx
index ae5d590f3..f13e26708 100644
--- a/components/admin/users/UserManagementTable.tsx
+++ b/components/admin/takgu/users/UserManagementTable.tsx
@@ -8,13 +8,13 @@ import {
TableContainer,
TableRow,
} from '@mui/material';
-import { IUser, IUserTable } from 'types/admin/adminUserTypes';
+import { IUser, IUserTable } from 'types/admin/takgu/adminUserTypes';
import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { tableFormat } from 'constants/admin/table';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
import PageNation from 'components/Pagination';
-import styles from 'styles/admin/users/UserManagementTable.module.scss';
+import styles from 'styles/admin/takgu/users/UserManagementTable.module.scss';
import { AdminEmptyItem, AdminTableHead } from '../common/AdminTable';
const tableTitle: { [key: string]: string } = {
diff --git a/components/agenda/Form/AdminTeamForm.tsx b/components/agenda/Form/AdminTeamForm.tsx
new file mode 100644
index 000000000..868de14fc
--- /dev/null
+++ b/components/agenda/Form/AdminTeamForm.tsx
@@ -0,0 +1,225 @@
+import router from 'next/router';
+import { useState } from 'react';
+import { TeamDetailProps } from 'types/agenda/teamDetail/TeamDetailTypes';
+import { transformTeamLocation } from 'utils/agenda/transformLocation';
+import { Coalition, TeamStatus } from 'constants/agenda/agenda';
+import Participant from 'components/agenda/agendaDetail/tabs/Participant';
+import { AddElementBtn, CancelBtn } from 'components/agenda/button/Buttons';
+import CheckBoxInput from 'components/agenda/Input/CheckboxInput';
+import DescriptionInput from 'components/agenda/Input/DescriptionInput';
+import SelectInput from 'components/agenda/Input/SelectInput';
+import TitleInput from 'components/agenda/Input/TitleInput';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/agenda/Form/Form.module.scss';
+
+interface AdminTeamFormProps {
+ teamKey: string;
+ teamData: TeamDetailProps;
+ teamLocation: string;
+}
+
+const AdminTeamForm = ({
+ teamKey,
+ teamData,
+ teamLocation,
+}: AdminTeamFormProps) => {
+ const sendRequest = useFetchRequest().sendRequest;
+ const [teamMates, setTeamMates] = useState(teamData.teamMates);
+
+ const transformFormData = (formData: FormData) => {
+ const data = Object.fromEntries(formData) as any;
+ return {
+ ...data,
+ teamIsPrivate: data.teamIsPrivate === 'on',
+ teamLocation: transformTeamLocation(data.teamLocation),
+ teamName: data.teamName.trim(),
+ teamContent: data.teamContent.trim(),
+ };
+ };
+
+ const handleDeleteParticipant = (index: number) => {
+ setTeamMates((prev) => prev.filter((_, i) => i !== index));
+ };
+
+ const isLeader = (intraId: string) => {
+ return teamData.teamLeaderIntraId === intraId;
+ };
+
+ const handleAddMember = () => {
+ const newMemberId = (
+ document.getElementById('newMemberId') as HTMLInputElement
+ )?.value.trim();
+
+ if (!newMemberId) {
+ alert('intra ID를 입력해주세요.');
+ return;
+ }
+ if (teamMates.some((member) => member.intraId === newMemberId)) {
+ alert('이미 존재하는 팀원입니다.');
+ return;
+ }
+ setTeamMates((prev) => [
+ ...prev,
+ { intraId: newMemberId, coalition: Coalition.OTHER },
+ ]);
+ (document.getElementById('newMemberId') as HTMLInputElement).value = '';
+ };
+
+ const AddLeader = (e: React.ChangeEventloading...
;
+ }
+
+ return (
+
+ );
+};
+
+export default UserForm;
diff --git a/components/agenda/Home/AgendaDeadLine.tsx b/components/agenda/Home/AgendaDeadLine.tsx
new file mode 100644
index 000000000..1c6293f3a
--- /dev/null
+++ b/components/agenda/Home/AgendaDeadLine.tsx
@@ -0,0 +1,60 @@
+import { AgendaStatus } from 'constants/agenda/agenda';
+import styles from 'styles/agenda/Home/AgendaDeadLine.module.scss';
+
+interface deadLineProps {
+ deadLine: string | Date;
+ status: AgendaStatus;
+ start?: string | Date;
+ end?: string | Date;
+}
+
+const AgendaDeadLine = ({ deadLine, status, start, end }: deadLineProps) => {
+ const currentDate = new Date();
+ const deadLineDate = new Date(deadLine);
+ const startDate = new Date(start || '');
+ const endDate = new Date(end || '');
+
+ const timeDiff = deadLineDate.getTime() - currentDate.getTime();
+ let daysLeft: number | string = 'DAY';
+
+ if (timeDiff > 0) daysLeft = Math.ceil(timeDiff / (1000 * 60 * 60 * 24));
+
+ // 컨펌인 상태 구분
+ let curr;
+ if (!start || !end) curr = 'error';
+ else if (currentDate >= startDate && currentDate <= endDate) curr = '진행중';
+ else if (currentDate < startDate) curr = '진행예정';
+ else curr = '진행완료';
+
+ switch (status) {
+ case 'FINISH':
+ return (
+
+
+ );
+ case 'CONFIRM':
+ return (
+ 종료
+
+
+ );
+ case 'CANCEL':
+ return (
+ {curr}
+
+
+ );
+ default:
+ if (timeDiff >= 0) {
+ return (
+ 취소
+
+
+ );
+ } else return null;
+ }
+};
+
+export default AgendaDeadLine;
diff --git a/components/agenda/Home/AgendaInfo.tsx b/components/agenda/Home/AgendaInfo.tsx
new file mode 100644
index 000000000..854ffb109
--- /dev/null
+++ b/components/agenda/Home/AgendaInfo.tsx
@@ -0,0 +1,81 @@
+import Image from 'next/image';
+import router from 'next/router';
+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
+const AgendaInfo = ({
+ agendaInfo,
+ idx,
+}: {
+ agendaInfo: AgendaDataProps;
+ idx: number;
+}) => {
+ if (!agendaInfo) {
+ return (
+ 모집마감
+ D-{daysLeft}
+
+
+ );
+ }
+ const startDate = new Date(agendaInfo.agendaStartTime);
+ const endDate = new Date(agendaInfo.agendaEndTime);
+
+ return (
+ 현재 모집 중인 행사가 없습니다.
+
+ {
+ router.push('/agenda');
+ }}
+ />
+
+ Agenda 가기
+
+ {agendaInfo.agendaStartTime
+ ? StartDate(agendaInfo.agendaStartTime as string)
+ : ''}
+
+ );
+};
+
+export default AgendaInfo;
diff --git a/components/agenda/Home/AgendaList.tsx b/components/agenda/Home/AgendaList.tsx
new file mode 100644
index 000000000..40b5df849
--- /dev/null
+++ b/components/agenda/Home/AgendaList.tsx
@@ -0,0 +1,116 @@
+import { useRouter } from 'next/router';
+import React, { useState } from 'react';
+import { AgendaDataProps } from 'types/agenda/agendaDetail/agendaTypes';
+import { AgendaStatus } from 'constants/agenda/agenda';
+import AgendaDeadLine from 'components/agenda/Home/AgendaDeadLine';
+import AgendaInfo from 'components/agenda/Home/AgendaInfo';
+import styles from 'styles/agenda/Home/AgendaList.module.scss';
+
+const AgendaList = ({
+ agendaList,
+ status,
+}: {
+ agendaList: AgendaDataProps[];
+ status: AgendaStatus;
+}) => {
+ const [selectedItem, setSelectedItem] = useState
+
+
+ {agendaInfo.agendaTitle}
+
+
+
+ {AgendaTags(agendaInfo)}
+
+
+
+
+
+ {showPeriod({ startDate, endDate })}
+
+
+
+
+
+ {agendaInfo.agendaCurrentTeam}/{agendaInfo.agendaMaxTeam}
+
+ 일정이 없습니다.
+ ) : (
+
+
+ )}
+
+ );
+};
+
+const AgendaListItem = ({
+ agendaInfo,
+ idx,
+ type,
+ className,
+ setSelectedItem,
+}: {
+ agendaInfo: AgendaDataProps;
+ idx: number;
+ type?: string;
+ className?: string;
+ setSelectedItem?: (key: number) => void;
+}) => {
+ const router = useRouter();
+ const href = `/agenda/detail?agenda_key=${agendaInfo.agendaKey}`;
+ return (
+
+ );
+};
+
+export default AgendaList;
diff --git a/components/agenda/Home/AgendaTitle.tsx b/components/agenda/Home/AgendaTitle.tsx
new file mode 100644
index 000000000..ccda6f444
--- /dev/null
+++ b/components/agenda/Home/AgendaTitle.tsx
@@ -0,0 +1,47 @@
+import Image from 'next/image';
+import Link from 'next/link';
+import MyAgendaBtn from 'components/agenda/Home/MyAgendaBtn';
+import styles from 'styles/agenda/Home/AgendaTitle.module.scss';
+
+const AgendaTitle = () => {
+ return (
+ <>
+
+
+
+ {agendaList.map((agendaInfo, idx) => {
+ agendaInfo.idx = idx;
+ agendaInfo.agendaStatus = status;
+ return (
+
+
+
+ Agenda
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default MyAgendaBtn;
diff --git a/components/agenda/Home/MyTeamInfo.tsx b/components/agenda/Home/MyTeamInfo.tsx
new file mode 100644
index 000000000..bcc0f2dd7
--- /dev/null
+++ b/components/agenda/Home/MyTeamInfo.tsx
@@ -0,0 +1,51 @@
+import Link from 'next/link';
+import { MyTeamDataProps } from 'types/agenda/agendaDetail/agendaTypes';
+import { AgendaTag } from 'components/agenda/utils/AgendaTag';
+import StartDate from 'components/agenda/utils/StartDate';
+import styles from 'styles/agenda/Home/MyTeamInfo.module.scss';
+
+// Props: API data
+const MyTeamInfo = ({
+ myTeamInfo,
+ idx,
+}: {
+ myTeamInfo: MyTeamDataProps;
+ idx: number;
+}) => {
+ if (!myTeamInfo) {
+ return
+
+
+ my agenda
+
+
+
+ {myList.length > 0 ? (
+ myList.map((myTeamInfo, idx) => (
+
+ There is no agenda
+ )}
+ 참가중인 일정이 없습니다.
;
+ }
+ return (
+
+
+ {StartDate(myTeamInfo.agendaStartTime as string)}
+
+
+ );
+};
+
+export default MyTeamInfo;
diff --git a/components/agenda/Input/AgendaSelect.tsx b/components/agenda/Input/AgendaSelect.tsx
new file mode 100644
index 000000000..392960be9
--- /dev/null
+++ b/components/agenda/Input/AgendaSelect.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import MenuItem from '@mui/material/MenuItem';
+import Select from '@mui/material/Select';
+
+interface AgendaSelectProps {
+ selectedKey: string;
+ dataList: any;
+ handleSelectChange: (event: { target: { value: any } }) => void;
+ defaultSelect?: string;
+}
+
+const AgendaSelect = ({
+ selectedKey,
+ dataList,
+ handleSelectChange,
+ defaultSelect = 'Choose an agenda...',
+}: AgendaSelectProps) => {
+ return (
+
+ );
+};
+
+export default AgendaSelect;
diff --git a/components/agenda/Input/CheckboxInput.tsx b/components/agenda/Input/CheckboxInput.tsx
new file mode 100644
index 000000000..cd97e79eb
--- /dev/null
+++ b/components/agenda/Input/CheckboxInput.tsx
@@ -0,0 +1,49 @@
+import { CheckboxProps } from 'types/aganda/InputPropTypes';
+import styles from 'styles/agenda/Input/CheckboxInput.module.scss';
+
+const CheckBoxInput = ({
+ name,
+ label,
+ options,
+ checked,
+ ...rest
+}: CheckboxProps) => {
+ return (
+
+
+
+ {myTeamInfo.teamName ? (
+ <>
+
+ {myTeamInfo.teamName}
+
+ {myTeamInfo.teamStatus === 'OPEN' ? (
+
+
+ ) : (
+ ''
+ )}
+
+
+ {myTeamInfo.agendaTitle}
+
+ {myTeamInfo.isOfficial ?
+
+ {options && options.length > 0 ? (
+ options.map((option, idx) => (
+ <>
+
+
+
+ ))
+ ) : (
+ <>
+
+
+
+ )}
+
+ );
+};
+
+export default CheckBoxInput;
diff --git a/components/agenda/Input/CountInput.tsx b/components/agenda/Input/CountInput.tsx
new file mode 100644
index 000000000..c168849f3
--- /dev/null
+++ b/components/agenda/Input/CountInput.tsx
@@ -0,0 +1,17 @@
+import { CountInputProps } from 'types/aganda/InputPropTypes';
+import Input from './Input';
+
+const CountInput = ({ name, label, min, max, ...rest }: CountInputProps) => {
+ return (
+
+ );
+};
+
+export default CountInput;
diff --git a/components/agenda/Input/DescriptionInput.tsx b/components/agenda/Input/DescriptionInput.tsx
new file mode 100644
index 000000000..1c7b28de4
--- /dev/null
+++ b/components/agenda/Input/DescriptionInput.tsx
@@ -0,0 +1,27 @@
+import { DescriptionProps } from 'types/aganda/InputPropTypes';
+import styles from 'styles/agenda/Input/DescriptionInput.module.scss';
+
+const DescriptionInput = ({
+ name,
+ label,
+ placeholder,
+ defaultValue,
+ ...rest
+}: DescriptionProps) => {
+ return (
+
+
+
+
+ );
+};
+
+export default DescriptionInput;
diff --git a/components/agenda/Input/ImageInput.tsx b/components/agenda/Input/ImageInput.tsx
new file mode 100644
index 000000000..0febf11ad
--- /dev/null
+++ b/components/agenda/Input/ImageInput.tsx
@@ -0,0 +1,8 @@
+import { ImageProps } from 'types/aganda/InputPropTypes';
+import Input from './Input';
+
+const ImageInput = ({ name, label, ...rest }: ImageProps) => {
+ return ;
+};
+
+export default ImageInput;
diff --git a/components/agenda/Input/Input.tsx b/components/agenda/Input/Input.tsx
new file mode 100644
index 000000000..713c80944
--- /dev/null
+++ b/components/agenda/Input/Input.tsx
@@ -0,0 +1,42 @@
+import { InputProps } from 'types/aganda/InputPropTypes';
+import styles from 'styles/agenda/Input/Input.module.scss';
+
+const Input = ({ name, label, type, ...rest }: InputProps) => {
+ return (
+
+
+ );
+};
+
+export default Input;
diff --git a/components/agenda/Input/SelectInput.tsx b/components/agenda/Input/SelectInput.tsx
new file mode 100644
index 000000000..8e9d81f19
--- /dev/null
+++ b/components/agenda/Input/SelectInput.tsx
@@ -0,0 +1,74 @@
+import { useRef, useState } from 'react';
+import { SelectInputProps } from 'types/aganda/InputPropTypes';
+import styles from 'styles/agenda/Input/SelectInput.module.scss';
+
+const SelectInput = ({
+ name,
+ options,
+ selected,
+ message,
+ label,
+ onChange,
+ ...rest
+}: SelectInputProps) => {
+ const [isSelected, setIsSelected] = useState
+ {label ? (
+
+ ) : null}
+ {rest?.error ? (
+
+ {type === 'checkbox' ? (
+ <>
+
+
+
+ ) : (
+
+ )}
+ {rest.error}
+ ) : null} +
+
+
+
+ );
+};
+
+export default SelectInput;
diff --git a/components/agenda/Input/TimeInput.tsx b/components/agenda/Input/TimeInput.tsx
new file mode 100644
index 000000000..f9b9aad8b
--- /dev/null
+++ b/components/agenda/Input/TimeInput.tsx
@@ -0,0 +1,32 @@
+import { DateInputProps } from 'types/aganda/InputPropTypes';
+import { dateToInputFormat, dateToString } from 'utils/handleTime';
+import Input from './Input';
+
+const DateInput = ({
+ name,
+ label,
+ min,
+ max,
+ defaultValue,
+ defaultDate,
+ ...rest
+}: DateInputProps) => {
+ if (min !== undefined) {
+ min = dateToInputFormat(new Date()); // 지금 시간으로 설정
+ }
+ if (max !== undefined) {
+ max = '2028-12-12'; // 한계 날짜? 임의로 설정
+ }
+
+ return (
+
+ );
+};
+
+export default DateInput;
diff --git a/components/agenda/Input/TitleInput.tsx b/components/agenda/Input/TitleInput.tsx
new file mode 100644
index 000000000..24d2154a0
--- /dev/null
+++ b/components/agenda/Input/TitleInput.tsx
@@ -0,0 +1,21 @@
+import { TitleInputProps } from 'types/aganda/InputPropTypes';
+import Input from './Input';
+
+const TitleInput = ({
+ name,
+ label,
+ defaultValue,
+ ...rest
+}: TitleInputProps) => {
+ return (
+
+ );
+};
+
+export default TitleInput;
diff --git a/components/agenda/Layout/AgendaFooter.tsx b/components/agenda/Layout/AgendaFooter.tsx
new file mode 100644
index 000000000..a7110914b
--- /dev/null
+++ b/components/agenda/Layout/AgendaFooter.tsx
@@ -0,0 +1,24 @@
+import styles from 'styles/takgu/Layout/Footer.module.scss';
+
+export default function AgendaFooter() {
+ return (
+
+ );
+}
diff --git a/components/agenda/Layout/AgendaHeader.tsx b/components/agenda/Layout/AgendaHeader.tsx
new file mode 100644
index 000000000..ffbc04d8f
--- /dev/null
+++ b/components/agenda/Layout/AgendaHeader.tsx
@@ -0,0 +1,47 @@
+import Link from 'next/link';
+import { createContext, Dispatch, SetStateAction, useState } from 'react';
+import { FiMenu } from 'react-icons/fi';
+import Logo from 'public/image/main-logo.svg';
+import styles from 'styles/agenda/Layout/Header.module.scss';
+import MenuBar from './MenuBar';
+
+export interface HeaderContextState {
+ openMenuState: boolean;
+ setOpenMenuBarState: Dispatch
+
+
+ HeaderState?.setOpenMenuBarState(!menu)}
+ />
+
+
+
+
+
+
+
+ );
+};
+
+export default AgendaUserLayout;
diff --git a/components/agenda/Layout/MenuBar.tsx b/components/agenda/Layout/MenuBar.tsx
new file mode 100644
index 000000000..4fc01ee09
--- /dev/null
+++ b/components/agenda/Layout/MenuBar.tsx
@@ -0,0 +1,87 @@
+import { useState } from 'react';
+import { useQueryClient } from 'react-query';
+import { useUser } from 'hooks/agenda/Layout/useUser';
+import useLogoutCheck from 'hooks/Login/useLogoutCheck';
+import styles from 'styles/agenda/Layout/MenuBar.module.scss';
+import { HeaderContextState } from './AgendaHeader';
+import MenuBarContent from './MenuBarContent';
+import { useModal } from '../modal/useModal';
+
+const MenuBar = ({ headerstate }: { headerstate: HeaderContextState }) => {
+ const user = useUser();
+ const queryClient = useQueryClient();
+ const { openModal, closeModal } = useModal();
+ const loading = useState(false);
+ const [onReturn, onLogout] = useLogoutCheck();
+
+ const handleLogout = () => {
+ openModal({
+ type: 'proceedCheck',
+ title: '로그아웃',
+ description: '로그아웃 하시겠습니까?',
+ onProceed: () => {
+ loading[1](true);
+ onLogout()
+ .then(() => queryClient.removeQueries('user'))
+ .finally(() => {
+ loading[1](false);
+ });
+
+ closeModal();
+ },
+ onCancel: closeModal,
+ });
+ };
+
+ return (
+ <>
+ {children}
+
+
+
+
+
+ );
+};
+
+export default MenuBar;
diff --git a/components/agenda/Layout/MenuBarContent.tsx b/components/agenda/Layout/MenuBarContent.tsx
new file mode 100644
index 000000000..04146a31e
--- /dev/null
+++ b/components/agenda/Layout/MenuBarContent.tsx
@@ -0,0 +1,56 @@
+import Link from 'next/link';
+import { ElementType, useContext } from 'react';
+import styles from 'styles/agenda/Layout/MenuBar.module.scss';
+import { HeaderContext, HeaderContextState } from './AgendaHeader';
+
+interface MenuBarContentProps {
+ as?: ElementType;
+ content: string;
+ href?: string;
+ onClick?: () => void;
+}
+
+// onClick 혹은 href 둘 중 하나는 반드시 있어야 합니다.
+const MenuBarContent = ({
+ as,
+ content,
+ href,
+ onClick,
+}: MenuBarContentProps) => {
+ const Elem = as || 'p';
+ const closeMenuBar =
+ useContext
+
+ {/* */}
+
+
+ {user?.isAdmin ? (
+ <>
+
+
+ {href ? (
+
+
+
+ ) : (
+ ''
+ )}
+ {!href && onClick ? (
+
+ ) : (
+ ''
+ )}
+
+ );
+};
+
+export default MenuBarContent;
diff --git a/components/agenda/Profile/AgendaUserSearchBar.tsx b/components/agenda/Profile/AgendaUserSearchBar.tsx
new file mode 100644
index 000000000..de79a1a92
--- /dev/null
+++ b/components/agenda/Profile/AgendaUserSearchBar.tsx
@@ -0,0 +1,68 @@
+import router from 'next/router';
+import { GoSearch } from 'react-icons/go';
+import { IoIosCloseCircle } from 'react-icons/io';
+import useSearchBar from 'hooks/useSearchBar';
+import styles from 'styles/agenda/Profile/AgendaUserSearchBar.module.scss';
+
+const AgendaUserSearchBar = () => {
+ const {
+ keyword,
+ setKeyword,
+ keywordHandler,
+ showDropDown,
+ setShowDropDown,
+ searchResult,
+ searchBarRef,
+ handleKeyDown,
+ } = useSearchBar();
+
+ const changeUser = (intraId: string) => {
+ setKeyword('');
+ setShowDropDown(false);
+ router.push(`/agenda/profile/user?id=${intraId}`);
+ };
+
+ return (
+ <>
+
+
+
+ );
+};
+
+export default AgendaUserSearchBar;
diff --git a/components/agenda/Profile/CurrentList.tsx b/components/agenda/Profile/CurrentList.tsx
new file mode 100644
index 000000000..3df648145
--- /dev/null
+++ b/components/agenda/Profile/CurrentList.tsx
@@ -0,0 +1,27 @@
+import { MyTeamDataProps } from 'types/agenda/agendaDetail/agendaTypes';
+import styles from 'styles/agenda/Profile/CurrentList.module.scss';
+import MyTeamInfo from '../Home/MyTeamInfo';
+
+const CurrentList = ({
+ currentListData,
+}: {
+ currentListData: MyTeamDataProps[];
+}) => {
+ return (
+
+ setShowDropDown(true)}
+ placeholder='유저 검색하기'
+ maxLength={12}
+ value={keyword}
+ />
+
+ {showDropDown && keyword && (
+
+ {keyword ? (
+ setKeyword('')}>
+
+
+ {searchResult.length ? (
+ searchResult.map((intraId: string) => (
+
+ )}
+ changeUser(intraId)} key={intraId}>
+ {intraId}
+
+ ))
+ ) : (
+ 검색 결과가 없습니다.
+ )}
+
+ {currentListData.length !== 0 ? (
+ currentListData.map((data: MyTeamDataProps, idx: number) => (
+
+ );
+};
+
+export default CurrentList;
diff --git a/components/agenda/Profile/HistoryList.tsx b/components/agenda/Profile/HistoryList.tsx
new file mode 100644
index 000000000..e21053293
--- /dev/null
+++ b/components/agenda/Profile/HistoryList.tsx
@@ -0,0 +1,122 @@
+import Link from 'next/link';
+import {
+ HistoryListProps,
+ HistoryItemProps,
+} from 'types/agenda/profile/historyListTypes';
+import AgendaTags from 'components/agenda/utils/AgendaTags';
+import { countHistoryCoalitions } from 'components/agenda/utils/coalition/countCoalitions';
+import ColorList from 'components/agenda/utils/ColorList';
+import TeamIcon from 'public/image/agenda/rock-and-roll-hand.svg';
+import TimeIcon from 'public/image/agenda/Time.svg';
+import styles from 'styles/agenda/Profile/HistoryList.module.scss';
+
+const parsingHistoryData = (historyData: HistoryItemProps) => {
+ const historyTeamMates = historyData.teamMates || null;
+ const totalPeople = historyData.teamMates ? historyData.teamMates.length : 0;
+ const peopleCount = historyData.teamMates
+ ? countHistoryCoalitions(historyData.teamMates)
+ : {};
+ const startTime = historyData.agendaStartTime.slice(0, 10);
+ const endTime = historyData.agendaEndTime.slice(0, 10);
+
+ let timeString = '';
+ if (startTime === endTime) timeString += startTime;
+ else timeString = startTime + ' ~ ' + endTime;
+
+ return {
+ historyTeamMates,
+ totalPeople,
+ peopleCount,
+ startTime,
+ endTime,
+ timeString,
+ };
+};
+
+const HistoryList = ({ historyListData }: HistoryListProps) => {
+ return (
+ <>
+
+
+ ))
+ ) : (
+
+ 아젠다 목록이 비어있습니다. 새로운 아젠다를 시작해보세요!
+
+ )}
+
+ {historyListData.length > 0 ? (
+ historyListData.map(
+ (historyData: HistoryItemProps, index: number) => {
+ const {
+ historyTeamMates,
+ totalPeople,
+ peopleCount,
+ startTime,
+ endTime,
+ timeString,
+ } = parsingHistoryData(historyData);
+
+ return (
+
+
+ +
+
+ );
+};
+
+export default HistoryList;
diff --git a/components/agenda/Profile/ProfileCard.tsx b/components/agenda/Profile/ProfileCard.tsx
new file mode 100644
index 000000000..59a8d1f0d
--- /dev/null
+++ b/components/agenda/Profile/ProfileCard.tsx
@@ -0,0 +1,241 @@
+import { useState, useEffect } from 'react';
+import { ProfileCardProps } from 'types/agenda/profile/profileCardTypes';
+import CustomImage from 'components/agenda/utils/CustomImage';
+import IntraIcon from 'public/image/agenda/42-icon.svg';
+import EditIcon from 'public/image/agenda/edit.svg';
+import GithubIcon from 'public/image/agenda/github.svg';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/agenda/Profile/ProfileCard.module.scss';
+
+const ProfileCard = ({
+ userIntraId,
+ userContent,
+ userGithub,
+ imageUrl,
+ achievements,
+ getProfileData,
+ isMyProfile,
+}: ProfileCardProps) => {
+ // 프로필 수정 버튼,수정 취소 버튼 180도 회전
+ const [isFlipped, setIsFlipped] = useState(false);
+ // 프로필 수정 취소 시, 기존 데이터로 복구
+ const [initialProfileData, setInitialProfileData] = useState({
+ userContent,
+ userGithub,
+ });
+ // 프로필 수정 시, 데이터 변하는 것 감지
+ const [profileData, setProfileData] = useState({
+ userContent,
+ userGithub,
+ });
+
+ // 수정 성공 시, 수정된 데이터로 초기화
+ useEffect(() => {
+ setProfileData({ userContent, userGithub });
+ setInitialProfileData({ userContent, userGithub });
+ }, [userContent, userGithub]);
+
+ // 클릭 시 isFlipped, true <-> false 변환
+ const handleFlip = () => {
+ setIsFlipped(!isFlipped);
+ };
+
+ // 수정되는 데이터 감지
+ const handleChange = (
+ e: React.ChangeEvent
+ {historyData.agendaTitle}
+
+
+
+ {AgendaTags(historyData)}
+
+
+
+
+ {/* Team 정보 UI / host 경우 ❌ */}
+ {historyTeamMates && historyTeamMates.length > 0 ? (
+ <>
+
+
+
+ {timeString}
+ + +
+ {historyData.teamName}
+
+
+
+
+
+ {/* coalition color mapping */}
+
+
+
+ {/* intra id mapping */}
+
+ {historyTeamMates.map((mate, index) => (
+
+
+ {mate.intraId}
+
+ ))}
+
+
+
+ ) : null}
+
+ );
+ }
+ )
+ ) : (
+
+ 아젠다 기록이 없습니다. 새로운 아젠다를 시작해보세요!
+
+ )}
+
+
+ );
+};
+
+export default ProfileCard;
diff --git a/components/agenda/Ticket/Ticket.tsx b/components/agenda/Ticket/Ticket.tsx
new file mode 100644
index 000000000..b79e39918
--- /dev/null
+++ b/components/agenda/Ticket/Ticket.tsx
@@ -0,0 +1,93 @@
+import Link from 'next/link';
+import { instanceInAgenda } from 'utils/axios';
+import useFetchGet from 'hooks/agenda/useFetchGet';
+import styles from 'styles/agenda/Ticket/Ticket.module.scss';
+import { useModal } from '../modal/useModal';
+interface TicketProps {
+ ticketCount: number;
+ setupTicket: boolean;
+}
+
+const Ticket = ({ type }: { type: string }) => {
+ const { data } = useFetchGet
+ {/* Back Side */}
+ {isMyProfile ? (
+
+
+
+ ) : (
+ ''
+ )}
+
+ {/* Front Side */}
+ 프로필 수정
+
+
+
+
+
+
+
+
+
+ 정보 추가
+
+
+
+
+ GitHub
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {userIntraId}
+ {isMyProfile ? (
+
+
+ ) : (
+ ''
+ )}
+
+
+ +
+
+ {userContent}
+
+
+ + +
+
+ Acheivements
+
+ {achievements.length
+ ? achievements.map((data, index) => {
+ const imageUrl = data.image;
+
+ if (imageUrl) {
+ const parsedUrl = imageUrl.replace(
+ '/uploads',
+ 'https://cdn.intra.42.fr'
+ );
+
+ return (
+
+
+
+ );
+ }
+ return null;
+ })
+ : ''}
+
+
+ ) : (
+ 내 티켓
+
+
+
+
+ {data && data.ticketCount}
+개
+
+
+ {data && data.setupTicket ? (
+
+ ) : (
+
+ )}
+
+
+
+ 발급 방법
+ +발급 시작 누르기
+ +
+ 평가 포인트 기부하기
+
+ {`(최대 2개까지 반영)`}
+
현재 페이지로 돌아와 발급완료 누르기
+
+
+ )}
+
+ );
+};
+
+export default Ticket;
diff --git a/components/agenda/Ticket/TicketHistory.tsx b/components/agenda/Ticket/TicketHistory.tsx
new file mode 100644
index 000000000..45664803f
--- /dev/null
+++ b/components/agenda/Ticket/TicketHistory.tsx
@@ -0,0 +1,55 @@
+import {
+ TableCell,
+ TableRow,
+ Table,
+ TableHead,
+ TableBody,
+} from '@mui/material';
+import { TicketHistoryProps } from 'types/aganda/ticketTypes';
+import styles from 'styles/agenda/Ticket/Ticket.module.scss';
+
+const TicketHistory = ({ data }: { data: TicketHistoryProps[] | null }) => {
+ return (
+ 내 티켓
+
+
+
+
+
+
+
+
+
+ {data && data.ticketCount}
+개
+
+
+
+
+ );
+};
+
+export default TicketHistory;
diff --git a/components/agenda/agendaDetail/AgendaInfo.tsx b/components/agenda/agendaDetail/AgendaInfo.tsx
new file mode 100644
index 000000000..10cf58930
--- /dev/null
+++ b/components/agenda/agendaDetail/AgendaInfo.tsx
@@ -0,0 +1,171 @@
+import { NextRouter, useRouter } from 'next/router';
+import { AgendaInfoProps } from 'types/agenda/agendaDetail/tabs/agendaInfoTypes';
+import { AgendaStatus, AgendaStatusTag } from 'constants/agenda/agenda';
+import { ShareBtn } from 'components/agenda/button/Buttons';
+import { UploadBtn } from 'components/agenda/button/UploadBtn';
+import { AgendaTag } from 'components/agenda/utils/AgendaTag';
+import { isSoloTeam } from 'components/agenda/utils/team';
+import useFetchRequest from 'hooks/agenda/useFetchRequest';
+import styles from 'styles/agenda/agendaDetail/AgendaInfo.module.scss';
+import StartDate from '../utils/StartDate';
+
+interface CallbackProps {
+ router: NextRouter;
+ agendaKey: string;
+}
+
+const copyLink = () => {
+ const url = window.location.href;
+ navigator.clipboard.writeText(url);
+ alert('링크가 복사되었습니다.');
+};
+
+const hostMode = ({ router, agendaKey }: CallbackProps) => {
+ router.push(`/agenda/detail/host?agenda_key=${agendaKey}`);
+};
+
+const subscribeTeam = ({ router, agendaKey }: CallbackProps) => {
+ router.push(`/agenda/detail/team/create?agenda_key=${agendaKey}`);
+};
+
+export default function AgendaInfo({
+ agendaData,
+ isHost,
+ myTeamStatus,
+ myTeam,
+ intraId,
+}: AgendaInfoProps) {
+ const sendRequest = useFetchRequest().sendRequest;
+
+ const subscribeSolo = ({ agendaKey }: CallbackProps) => {
+ const soloData = {
+ teamName: intraId,
+ teamLocation: agendaData.agendaLocation,
+ teamContent: '개인참여',
+ teamIsPrivate: false,
+ };
+
+ // 개인 참여
+ sendRequest(
+ 'POST',
+ 'team',
+ soloData,
+ { agenda_key: agendaKey },
+ (response: any) => {
+ const newTeamKey = response ? response.teamKey : null;
+ if (newTeamKey) {
+ // 개인 참여 확정
+ sendRequest(
+ 'PATCH',
+ 'team/confirm',
+ {},
+ { agenda_key: agendaKey, teamKey: newTeamKey },
+ () => {
+ window.location.reload();
+ }
+ );
+ }
+ }
+ );
+ };
+
+ const unsubscribeSolo = ({ agendaKey }: CallbackProps) => {
+ const myTeamKey = myTeam ? myTeam.teamKey : null;
+
+ sendRequest(
+ 'PATCH',
+ 'team/cancel',
+ {},
+ {
+ agenda_key: agendaKey,
+ teamKey: myTeamKey,
+ },
+ () => {
+ window.location.reload();
+ }
+ );
+ };
+
+ const determineButton = () => {
+ const isParticipant = myTeamStatus === 200;
+ const isSolo = isSoloTeam(
+ agendaData.agendaMinPeople,
+ agendaData.agendaMaxPeople
+ );
+
+ switch (agendaData.agendaStatus) {
+ case AgendaStatus.CONFIRM:
+ return isHost ? { text: '주최자 관리', callback: hostMode } : null;
+ case AgendaStatus.OPEN:
+ if (isHost) {
+ // 주최자
+ return { text: '주최자 관리', callback: hostMode };
+ } else if (isParticipant) {
+ // 참가자
+ if (isSolo) {
+ return { text: '등록취소', callback: unsubscribeSolo };
+ }
+ return null;
+ } else {
+ // 손님
+ if (isSolo) {
+ return { text: '등록하기', callback: subscribeSolo };
+ }
+ return { text: '팀 만들기', callback: subscribeTeam };
+ }
+ default:
+ return null;
+ }
+ };
+
+ const buttonData = determineButton();
+
+ const { agendaTitle, agendaHost, agendaKey } = agendaData;
+
+ const isAgendaDetail = isHost !== undefined && myTeamStatus !== undefined;
+ const containerSize = isAgendaDetail
+ ? styles.largeHeight
+ : styles.smallHeight;
+
+ const router = useRouter();
+
+ return (
+ <>
+ 티켓 발급 내역
+
+
+
+ );
+}
diff --git a/components/agenda/agendaDetail/AgendaTab.tsx b/components/agenda/agendaDetail/AgendaTab.tsx
new file mode 100644
index 000000000..1a26a3bae
--- /dev/null
+++ b/components/agenda/agendaDetail/AgendaTab.tsx
@@ -0,0 +1,27 @@
+import { useState } from 'react';
+import { AgendaTabProps } from 'types/agenda/agendaDetail/tabs/agendaInfoTypes';
+import { TABS, TabValues } from 'constants/agenda/agendaDetail/agendaTabs';
+import TabContent from 'components/agenda/agendaDetail/TabContent';
+import TabButtons from 'components/agenda/button/TabButtons';
+import styles from 'styles/agenda/agendaDetail/AgendaTab.module.scss';
+
+export default function AgendaTab({ agendaData, myTeam }: AgendaTabProps) {
+ const [activeTab, setActiveTab] = useState
+
+
+
+
+ {StartDate(agendaData.agendaStartTime as string)}
+
+ {agendaTitle}
+
+ 주최자 : {agendaHost}
+
+
+ {isAgendaDetail && {
+ buttonData.callback({
+ router: router,
+ agendaKey: agendaKey,
+ });
+ }}
+ />
+ )}
+
+
+
+
+ );
+}
diff --git a/components/agenda/agendaDetail/TabContent.tsx b/components/agenda/agendaDetail/TabContent.tsx
new file mode 100644
index 000000000..9ec55b7f9
--- /dev/null
+++ b/components/agenda/agendaDetail/TabContent.tsx
@@ -0,0 +1,44 @@
+import { TabContentProps } from 'types/agenda/button/tabButtonTypes';
+import AgendaAnnouncements from 'components/agenda/agendaDetail/tabs/AgendaAnnouncements';
+import AgendaDescription from 'components/agenda/agendaDetail/tabs/AgendaDescription';
+import AgendaParticipants from 'components/agenda/agendaDetail/tabs/AgendaParticipants';
+import AgendaPoster from 'components/agenda/agendaDetail/tabs/AgendaPoster';
+import styles from 'styles/agenda/agendaDetail/AgendaTab.module.scss';
+
+export default function TabContent({
+ activeTab,
+ tabs,
+ agendaData,
+ myTeam,
+}: TabContentProps) {
+ const renderContent = () => {
+ switch (activeTab) {
+ case tabs.DESCRIPTION:
+ return (
+
+
+ );
+ case tabs.PARTICIPANTS:
+ return
+
+
+
+ );
+ default:
+ return null;
+ }
+ };
+ return
+
+ {renderContent()}
;
+}
diff --git a/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx b/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx
new file mode 100644
index 000000000..0c130e0dc
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx
@@ -0,0 +1,71 @@
+import { useState } from 'react';
+import { AnnouncementProps } from 'types/agenda/agendaDetail/announcementTypes';
+import AnnouncementItem from 'components/agenda/agendaDetail/tabs/AnnouncementItem';
+import AgendaLoading from 'components/agenda/utils/AgendaLoading';
+import PageNation from 'components/Pagination';
+import useAgendaKey from 'hooks/agenda/useAgendaKey';
+import usePageNation from 'hooks/agenda/usePageNation';
+import styles from 'styles/agenda/agendaDetail/tabs/AgendaAnnouncements.module.scss';
+
+export default function AgendaAnnouncements() {
+ const agendaKey = useAgendaKey();
+ const [selected, setSelected] = useState
+
+ );
+ }
+ return (
+ <>
+ {content && content.length > 0 ? (
+ <>
+
+ {content.map((item, idx) => (
+ setSelected(idx)}
+ />
+ ))}
+
+ {content[selected] ? (
+ 공지사항이 없습니다.
+ )}
+
+ );
+}
diff --git a/components/agenda/agendaDetail/tabs/AgendaConditions.tsx b/components/agenda/agendaDetail/tabs/AgendaConditions.tsx
new file mode 100644
index 000000000..0f68fda90
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/AgendaConditions.tsx
@@ -0,0 +1,51 @@
+import { AgendaProps } from 'types/agenda/agendaDetail/agendaTypes';
+import { AgendaLocation } from 'constants/agenda/agenda';
+import styles from 'styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss';
+
+export default function AgendaConditions({ agendaData }: AgendaProps) {
+ const {
+ agendaMinPeople,
+ agendaMaxPeople,
+ agendaMinTeam,
+ agendaMaxTeam,
+ agendaLocation,
+ } = agendaData;
+
+ const location =
+ agendaLocation == AgendaLocation.SEOUL
+ ? '서울'
+ : agendaLocation == AgendaLocation.GYEONGSAN
+ ? '경산'
+ : '서울, 경산';
+
+ const teamPeople =
+ agendaMinPeople === agendaMaxPeople
+ ? `개인`
+ : `${agendaMinPeople} ~ ${agendaMaxPeople}명`;
+ return (
+ <>
+
+
+
+ );
+}
diff --git a/components/agenda/agendaDetail/tabs/AgendaDescription.tsx b/components/agenda/agendaDetail/tabs/AgendaDescription.tsx
new file mode 100644
index 000000000..72db01c78
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/AgendaDescription.tsx
@@ -0,0 +1,66 @@
+import { AgendaProps } from 'types/agenda/agendaDetail/agendaTypes';
+import { formatDate } from 'utils/agenda/formatDate';
+import AgendaTags from 'components/agenda/utils/AgendaTags';
+import styles from 'styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss';
+
+export default function AgendaDescription({ agendaData }: AgendaProps) {
+ const {
+ agendaContent,
+ agendaDeadLine,
+ agendaStartTime,
+ agendaEndTime,
+ isOfficial,
+ agendaisRanking,
+ agendaMinPeople,
+ agendaMaxPeople,
+ agendaMinTeam,
+ agendaMaxTeam,
+ } = agendaData;
+
+ const teamPeople =
+ agendaMinPeople === agendaMaxPeople
+ ? `개인`
+ : `${agendaMinPeople} ~ ${agendaMaxPeople}명`;
+
+ const additionalInfo = [
+ { label: '모집 팀', value: `${agendaMinTeam}팀 ~ ${agendaMaxTeam}팀` },
+ { label: '팀 인원', value: teamPeople },
+ { label: '시상 여부', value: agendaisRanking ? '시상 있음' : '시상 없음' },
+ { label: '공식대회 여부', value: isOfficial ? '공식대회' : '비공식대회' },
+ ];
+
+ return (
+ 대회 참여 조건
+
+
+
+ 팀 인원
+ {' : '}
+ {teamPeople}
+
+
+ 최소 팀 {' : '}{' '}
+ {agendaMinTeam}팀
+
+
+ 최대 팀 {' : '}
+ {agendaMaxTeam}팀
+
+
+ 장소
+ {' : '} {location}
+
+
+
+ );
+}
diff --git a/components/agenda/agendaDetail/tabs/AgendaParticipants.tsx b/components/agenda/agendaDetail/tabs/AgendaParticipants.tsx
new file mode 100644
index 000000000..bc2a95f12
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/AgendaParticipants.tsx
@@ -0,0 +1,32 @@
+import { ParticipantTabProps } from 'types/agenda/agendaDetail/tabs/participantTypes';
+import ParticipantsList from 'components/agenda/agendaDetail/tabs/ParticipantsList';
+import { isSoloTeam } from 'components/agenda/utils/team';
+import styles from 'styles/agenda/agendaDetail/tabs/AgendaParticipants.module.scss';
+import ParticipantTeamList from './ParticipantTeamList';
+
+export default function AgendaParticipants({
+ myTeam,
+ agendaData,
+}: ParticipantTabProps) {
+ const { agendaMinPeople, agendaMaxPeople, agendaMaxTeam } = agendaData;
+
+ return (
+ <>
+ 대회 정보
+ {AgendaTags(agendaData)}
+
+
+
+
+
+
+ 대회 설명
+ {agendaContent} +
+
+ 모집 완료 기간
+ {formatDate(agendaDeadLine)} +
+
+ 이벤트 기간
+
+
+ {formatDate(agendaStartTime)}
+{`~ ${formatDate(agendaEndTime)}`}
+
+ {additionalInfo.map((item, index) => (
+
+
+
+ ))}
+ {item.label}
+ {' : '} + {item.value} +
+ {isSoloTeam(agendaMinPeople, agendaMaxPeople) ? (
+
+
+ );
+}
diff --git a/components/agenda/agendaDetail/tabs/AgendaPoster.tsx b/components/agenda/agendaDetail/tabs/AgendaPoster.tsx
new file mode 100644
index 000000000..fa84e394f
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/AgendaPoster.tsx
@@ -0,0 +1,27 @@
+import Image from 'next/image';
+import styles from 'styles/agenda/agendaDetail/AgendaTab.module.scss';
+
+interface AgendaPosterProps {
+ poster: string | null | undefined;
+}
+
+const AgendaPoster = ({ poster }: AgendaPosterProps) => {
+ return (
+
+
+ ) : (
+
+
+ )}
+
+ {poster ? (
+
+ );
+};
+
+export default AgendaPoster;
diff --git a/components/agenda/agendaDetail/tabs/AnnouncementItem.tsx b/components/agenda/agendaDetail/tabs/AnnouncementItem.tsx
new file mode 100644
index 000000000..7cc09e642
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/AnnouncementItem.tsx
@@ -0,0 +1,49 @@
+import { useState } from 'react';
+import { AnnouncementProps } from 'types/agenda/agendaDetail/announcementTypes';
+import { formatDate } from 'utils/agenda/formatDate';
+import DownArrow from 'public/image/agenda/ChevronDown.svg';
+import RightArrow from 'public/image/agenda/ChevronRight.svg';
+import styles from 'styles/agenda/agendaDetail/tabs/AnnouncementItem.module.scss';
+
+export default function AnnouncementItem({
+ title,
+ content,
+ createdAt,
+ isSelected,
+ isListSelected,
+ setSelected,
+}: AnnouncementProps) {
+ const [isOpen, setIsOpen] = useState(isSelected || false);
+
+ const toggleContent = () => {
+ setIsOpen(!isOpen);
+ };
+
+ return (
+ <>
+ 등록된 포스터가 없습니다.
+ )}
+ setSelected && setSelected()}
+ >
+
+
+ );
+}
diff --git a/components/agenda/agendaDetail/tabs/Participant.tsx b/components/agenda/agendaDetail/tabs/Participant.tsx
new file mode 100644
index 000000000..6507273dc
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/Participant.tsx
@@ -0,0 +1,35 @@
+import Link from 'next/link';
+import React from 'react';
+import { ParticipantProps } from 'types/agenda/agendaDetail/tabs/participantTypes';
+import { colorMapping, iconMapping } from 'types/agenda/utils/colorList';
+import { getCoalitionEnum } from 'components/agenda/utils/coalition/getCoalitionEnum';
+import styles from 'styles/agenda/agendaDetail/tabs/Participant.module.scss';
+
+export default function Participant({
+ teamName,
+ coalitions,
+}: ParticipantProps) {
+ const coalitionEnum = getCoalitionEnum(coalitions);
+
+ if (!coalitionEnum || coalitionEnum.length !== 1) {
+ console.error('유효하지 않은 coalition 값입니다.');
+ return null;
+ }
+
+ const IconComponent = iconMapping[coalitionEnum[0]];
+
+ return (
+
+
+
+ {isOpen &&
+ {isOpen ? (
+
+
+
+ {title}
+
+ {formatDate(createdAt)}
+
+ {content}
}
+
+
+
+ );
+}
diff --git a/components/agenda/agendaDetail/tabs/ParticipantTeam.tsx b/components/agenda/agendaDetail/tabs/ParticipantTeam.tsx
new file mode 100644
index 000000000..7e5e283d9
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/ParticipantTeam.tsx
@@ -0,0 +1,78 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+import {
+ ParticipantTeamProps,
+ PeopleCount,
+} from 'types/agenda/agendaDetail/tabs/participantTypes';
+import AgendaLoading from 'components/agenda/utils/AgendaLoading';
+import { countCoalitions } from 'components/agenda/utils/coalition/countCoalitions';
+import { getCoalitionEnum } from 'components/agenda/utils/coalition/getCoalitionEnum';
+import ColorList from 'components/agenda/utils/ColorList';
+import TeamLeaderIcon from 'public/image/agenda/rock-and-roll-hand.svg';
+import useAgendaKey from 'hooks/agenda/useAgendaKey';
+import styles from 'styles/agenda/agendaDetail/tabs/ParticipantTeam.module.scss';
+
+const totalPeople = (peopleCount: PeopleCount) => {
+ return Object.values(peopleCount).reduce((sum, count) => sum + count, 0);
+};
+
+export default function ParticipantTeam({
+ teamKey,
+ teamName,
+ teamLeaderIntraId,
+ teamMateCount,
+ maxMateCount,
+ coalitions,
+}: ParticipantTeamProps) {
+ const agendaKey = useAgendaKey();
+ const coalitionEnum = getCoalitionEnum(coalitions);
+ const peopleCount = countCoalitions(coalitionEnum);
+
+ const content = (
+
+
+ {teamName}
+ {IconComponent ?
+
+ );
+
+ const colorList = (
+
+
+
+ {teamName}
+
+
+
+ {teamLeaderIntraId}
+
+ {teamMateCount} / {maxMateCount}
+
+
+ {content}
+ {colorList}
+
+ )}
+
+ );
+}
diff --git a/components/agenda/agendaDetail/tabs/ParticipantTeamList.tsx b/components/agenda/agendaDetail/tabs/ParticipantTeamList.tsx
new file mode 100644
index 000000000..e4b8f70f4
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/ParticipantTeamList.tsx
@@ -0,0 +1,119 @@
+import { ParticipantTeamListProps } from 'types/agenda/agendaDetail/tabs/participantTypes';
+import { TeamDataProps } from 'types/agenda/team/teamDataTypes';
+import ParticipantTeam from 'components/agenda/agendaDetail/tabs/ParticipantTeam';
+import AgendaLoading from 'components/agenda/utils/AgendaLoading';
+import PageNation from 'components/Pagination';
+import useAgendaKey from 'hooks/agenda/useAgendaKey';
+import usePageNation from 'hooks/agenda/usePageNation';
+import styles from 'styles/agenda/agendaDetail/tabs/ParticipantTeamList.module.scss';
+
+export default function ParticipantTeamList({
+ maxTeam,
+ maxPeople,
+ myTeam,
+}: ParticipantTeamListProps) {
+ const agendaKey = useAgendaKey();
+
+ const {
+ content: openTeams,
+ PagaNationElementProps: openTeamPageNationProps,
+ } = usePageNation팀이 없습니다.
+ );
+ const openTeamsCount = openTeams ? openTeams.length : 0;
+ const confirmedTeamsCount = confirmedTeams ? confirmedTeams.length : 0;
+
+ if (!agendaKey || !openTeams || !confirmedTeams) {
+ return (
+
+
+ );
+ }
+ return (
+ <>
+
+
+
+ );
+}
diff --git a/components/agenda/agendaDetail/tabs/ParticipantsList.tsx b/components/agenda/agendaDetail/tabs/ParticipantsList.tsx
new file mode 100644
index 000000000..d3e735ee5
--- /dev/null
+++ b/components/agenda/agendaDetail/tabs/ParticipantsList.tsx
@@ -0,0 +1,50 @@
+import {
+ numberProps,
+ ParticipantProps,
+} from 'types/agenda/agendaDetail/tabs/participantTypes';
+import Participant from 'components/agenda/agendaDetail/tabs/Participant';
+import AgendaLoading from 'components/agenda/utils/AgendaLoading';
+import PageNation from 'components/Pagination';
+import useAgendaKey from 'hooks/agenda/useAgendaKey';
+import usePageNation from 'hooks/agenda/usePageNation';
+import styles from 'styles/agenda/agendaDetail/tabs/ParticipantsList.module.scss';
+
+export default function ParticipantsList({ max }: numberProps) {
+ const agendaKey = useAgendaKey();
+
+ const { content: participants, PagaNationElementProps } =
+ usePageNation
+
+
+ 내 팀
+ {myTeam ? (
+ <>
+
+
+
+
+ 모집중인 팀 {openTeamsCount}
+
+ {openTeams && openTeamsCount > 0 ? (
+ <>
+ {openTeams.map((team) => (
+
+
+
+ 확정완료 팀 {confirmedTeamsCount} / {maxTeam}
+
+ {confirmedTeams && confirmedTeamsCount > 0 ? (
+ <>
+ {confirmedTeams.map((team) => (
+
+ 참여자 {curPeople} / {max}
+
+ {curPeople > 0 ? (
+
+
+ ) : (
+
+ {participants.map((participant, index) => (
+
+ 참여자가 없습니다.
+ )}
+
+ );
+}
diff --git a/components/agenda/button/Buttons.tsx b/components/agenda/button/Buttons.tsx
new file mode 100644
index 000000000..1b4e9d03e
--- /dev/null
+++ b/components/agenda/button/Buttons.tsx
@@ -0,0 +1,107 @@
+import styles from 'styles/agenda/button/Buttons.module.scss';
+
+const CancelBtn = ({
+ onClick,
+}: {
+ onClick: (e: React.MouseEvent
+ {Object.values(tabs).map((tab) => (
+ onTabClick(tab)}
+ />
+ ))}
+
+ );
+}
diff --git a/components/agenda/button/UploadBtn.tsx b/components/agenda/button/UploadBtn.tsx
new file mode 100644
index 000000000..88e012ec5
--- /dev/null
+++ b/components/agenda/button/UploadBtn.tsx
@@ -0,0 +1,14 @@
+import { UploadButtonProps } from 'types/agenda/button/uploadButtonTypes';
+import Upload from 'public/image/agenda/upload.svg';
+import styles from 'styles/agenda/button/UploadBtn.module.scss';
+
+const UploadBtn = ({ text, onClick }: UploadButtonProps) => {
+ return (
+
+ );
+};
+
+export { UploadBtn };
diff --git a/components/agenda/modal/AgendaModalProvider.tsx b/components/agenda/modal/AgendaModalProvider.tsx
new file mode 100644
index 000000000..ec16b7984
--- /dev/null
+++ b/components/agenda/modal/AgendaModalProvider.tsx
@@ -0,0 +1,50 @@
+import { useRecoilState } from 'recoil';
+import { agendaModalState } from 'utils/recoil/agenda/modalState';
+import ModifyModal from 'components/agenda/modal/ModifyModal';
+import NoticeModal from 'components/agenda/modal/NoticeModal';
+import ProceedCheckModal from 'components/agenda/modal/ProceedCheckModal';
+import { useModal } from 'components/agenda/modal/useModal';
+import styles from 'styles/agenda/modal/AgendaModalProvider.module.scss';
+
+const AgendaModalProvider = () => {
+ const [modalProps] = useRecoilState(agendaModalState);
+ const { closeModal } = useModal();
+
+ let modalContent;
+ if (modalProps) {
+ switch (modalProps.type) {
+ case 'proceedCheck':
+ modalContent =
+ {modalContent}
+
+ )}
+
+ );
+};
+
+export default AgendaModalProvider;
diff --git a/components/agenda/modal/ModifyModal.tsx b/components/agenda/modal/ModifyModal.tsx
new file mode 100644
index 000000000..1f85dc203
--- /dev/null
+++ b/components/agenda/modal/ModifyModal.tsx
@@ -0,0 +1,53 @@
+import { agendaModal } from 'types/agenda/modalTypes';
+import styles from 'styles/agenda/modal/modal.module.scss';
+
+interface FormComponentProps {
+ isAdmin?: boolean;
+ data: any;
+ stringKey?: string;
+ onProceed?: () => void;
+}
+
+interface ModifyModalProps extends agendaModal {
+ FormComponent?: React.FC
+ {title && (
+
+
+ );
+};
+
+export default ModifyModal;
diff --git a/components/agenda/modal/NoticeModal.tsx b/components/agenda/modal/NoticeModal.tsx
new file mode 100644
index 000000000..fd76f52c9
--- /dev/null
+++ b/components/agenda/modal/NoticeModal.tsx
@@ -0,0 +1,41 @@
+import Image from 'next/image';
+import { agendaModal } from 'types/agenda/modalTypes';
+import { useModal } from 'components/agenda/modal/useModal';
+import styles from 'styles/agenda/modal/modal.module.scss';
+
+const NoticeModal = (props: agendaModal) => {
+ const { title, description, onProceed, image } = props;
+ const { handleProceed } = useModal();
+
+ return (
+ <>
+
+
+ )}
+ {title}
+
+ {description}
+
+
+
+ {FormComponent && (
+
+
+ {title && (
+
+
+ );
+};
+
+export default NoticeModal;
diff --git a/components/agenda/modal/ProceedCheckModal.tsx b/components/agenda/modal/ProceedCheckModal.tsx
new file mode 100644
index 000000000..823691f1d
--- /dev/null
+++ b/components/agenda/modal/ProceedCheckModal.tsx
@@ -0,0 +1,57 @@
+import { agendaModal } from 'types/agenda/modalTypes';
+import { useModal } from 'components/agenda/modal/useModal';
+import styles from 'styles/agenda/modal/modal.module.scss';
+
+const ProceedCheckModal = (props: agendaModal) => {
+ const {
+ type,
+ title,
+ description,
+ contentsToCheck,
+ onProceed,
+ onCancel,
+ proceedText,
+ cancelText,
+ extraButtons,
+ } = props;
+
+ const { handleProceed, handleCancel } = useModal();
+
+ return (
+ <>
+
+
+ )}
+ {title}
+
+
+ {description}
+ {image && ( + <> +
+
+
+
+ {title && (
+
+
+ );
+};
+
+export default ProceedCheckModal;
diff --git a/components/agenda/modal/testModal.tsx b/components/agenda/modal/testModal.tsx
new file mode 100644
index 000000000..411e3fc2e
--- /dev/null
+++ b/components/agenda/modal/testModal.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { useModal } from 'components/agenda/modal/useModal';
+
+const TestModal = () => {
+ const { openModal } = useModal();
+ const test = () => {
+ openModal({
+ type: 'proceedCheck',
+ title: 'title',
+ description: 'message',
+ onProceed: () => {
+ console.log('onProceed'); //test
+ },
+ proceedText: '확인',
+ cancelText: '취소',
+ });
+ };
+
+ return ;
+};
+
+const TestModal2 = () => {
+ const { openModal } = useModal();
+
+ const openAlarmModal = () => {
+ openModal({
+ type: 'notice',
+ title: 'title',
+ description: 'message',
+ onProceed: () => {
+ console.log('onProceed'); //test
+ },
+ });
+ };
+
+ return ;
+};
+
+export { TestModal, TestModal2 };
diff --git a/components/agenda/modal/useModal.tsx b/components/agenda/modal/useModal.tsx
new file mode 100644
index 000000000..998f7305f
--- /dev/null
+++ b/components/agenda/modal/useModal.tsx
@@ -0,0 +1,27 @@
+import { useSetRecoilState } from 'recoil';
+import { agendaModal } from 'types/agenda/modalTypes';
+import { agendaModalState } from 'utils/recoil/agenda/modalState';
+
+export const useModal = () => {
+ const setModalState = useSetRecoilState(agendaModalState);
+
+ const openModal = (props: agendaModal) => {
+ setModalState(props);
+ };
+
+ const closeModal = () => {
+ setModalState(null);
+ };
+
+ const handleCancel = (onCancel?: () => void) => {
+ if (onCancel) onCancel();
+ closeModal();
+ };
+
+ const handleProceed = (onProceed?: () => void) => {
+ if (onProceed) onProceed();
+ closeModal();
+ };
+
+ return { openModal, closeModal, handleCancel, handleProceed };
+};
diff --git a/components/agenda/teamDetail/TeamButtons.tsx b/components/agenda/teamDetail/TeamButtons.tsx
new file mode 100644
index 000000000..b87d5c2a4
--- /dev/null
+++ b/components/agenda/teamDetail/TeamButtons.tsx
@@ -0,0 +1,104 @@
+import {
+ TeamButtonsProps,
+ BtnInfoProps,
+} from 'types/agenda/teamDetail/TeamButtonsTypes';
+import { Authority, TeamStatus } from 'constants/agenda/agenda';
+import { useModal } from 'components/agenda/modal/useModal';
+import styles from 'styles/agenda/TeamDetail/TeamButtons.module.scss';
+
+const TeamButtons = ({
+ authority,
+ teamStatus,
+ manageTeamDetail,
+}: TeamButtonsProps) => {
+ const { openModal } = useModal();
+
+ /** renderButton : 버튼 정보를 인자로 받아서 버튼을 생성하는 함수 */
+ const renderButton = (fristBtn: BtnInfoProps, secondBtn?: BtnInfoProps) => {
+ const handleClick = (description: string, onProceed: () => void) => {
+ openModal({
+ type: 'proceedCheck',
+ description: description,
+ onProceed: onProceed,
+ });
+ };
+
+ return (
+
+
+ )}
+ {title}
+
+
+ {description}
+ {contentsToCheck && ( +
+ {Object.keys(contentsToCheck).map((key, idx) => {
+ if (!contentsToCheck || !contentsToCheck[key]) return null;
+ return (
+
+ )}
+
+
+ );
+ })}
+ {key}
+{contentsToCheck[key]}
+
+
+ {' '}
+
+
+ {fristBtn ? (
+
+ ) : null}
+
+ {secondBtn ? (
+
+ ) : null}
+
+ );
+ };
+
+ /** TeamStatus, Authority에 따라 버튼 정보를 다르게 설정 */
+ switch (teamStatus) {
+ case TeamStatus.CONFIRM:
+ if (authority === Authority.LEADER) {
+ return renderButton({
+ label: '팀 폭파하기',
+ description: '확인 버튼을 누르면, 팀이 삭제됩니다.',
+ onProceed: () =>
+ manageTeamDetail && manageTeamDetail('PATCH', 'team/cancel'),
+ });
+ }
+ return null;
+
+ case TeamStatus.OPEN:
+ if (authority === Authority.GEUST) {
+ return renderButton({
+ label: '팀 참가하기',
+ description: '확인 버튼을 누르면, 팀에 참가됩니다.',
+ onProceed: () =>
+ manageTeamDetail && manageTeamDetail('POST', 'team/join'),
+ });
+ } else if (authority === Authority.MEMBER) {
+ return renderButton({
+ label: '팀 나가기',
+ description: '확인 버튼을 누르면, 팀에서 나가게 됩니다.',
+ onProceed: () =>
+ manageTeamDetail && manageTeamDetail('PATCH', 'team/drop'),
+ });
+ } else if (authority === Authority.LEADER) {
+ return renderButton(
+ {
+ label: '팀 폭파하기',
+ description: '확인 버튼을 누르면, 팀이 삭제됩니다.',
+ onProceed: () =>
+ manageTeamDetail && manageTeamDetail('PATCH', 'team/cancel'),
+ },
+ {
+ label: '팀 확정하기',
+ description: '확인 버튼을 누르면, 팀이 확정됩니다.',
+ onProceed: () =>
+ manageTeamDetail && manageTeamDetail('PATCH', 'team/confirm'),
+ }
+ );
+ }
+ return null; // NONE, HOST
+
+ default: // CANCEL
+ return null;
+ }
+};
+
+export default TeamButtons;
diff --git a/components/agenda/teamDetail/TeamInfo.tsx b/components/agenda/teamDetail/TeamInfo.tsx
new file mode 100644
index 000000000..389c5d5dd
--- /dev/null
+++ b/components/agenda/teamDetail/TeamInfo.tsx
@@ -0,0 +1,117 @@
+import { useState } from 'react';
+import { TeamInfoProps } from 'types/agenda/teamDetail/TeamInfoTypes';
+import { colorMapping } from 'types/agenda/utils/colorList';
+import { TeamStatus, Authority } from 'constants/agenda/agenda';
+import { ShareBtn } from 'components/agenda/button/Buttons';
+import CreateTeamForm from 'components/agenda/Form/CreateTeamForm';
+import TeamButtons from 'components/agenda/teamDetail/TeamButtons';
+import AgendaLoading from 'components/agenda/utils/AgendaLoading';
+import EditIcon from 'public/image/agenda/edit.svg';
+import useAgendaKey from 'hooks/agenda/useAgendaKey';
+import styles from 'styles/agenda/TeamDetail/TeamInfo.module.scss';
+
+const TeamInfo = ({
+ teamDetail,
+ shareTeamInfo,
+ maxPeople,
+ authority,
+ manageTeamDetail,
+ submitTeamForm,
+}: TeamInfoProps) => {
+ // EditTeam UI <-> TeamInfo UI 전환
+ const [convert, setConvert] = useState(true);
+ const agendaKey = useAgendaKey();
+
+ const handleConvert = () => {
+ setConvert(!convert);
+ };
+
+ if (!agendaKey) {
+ return
+
+
+
+
+
+ {teamDetail.teamName}
+ {teamDetail.teamStatus === TeamStatus.OPEN && + authority === Authority.LEADER ? ( +
+ setConvert(!convert)} />
+
+ ) : (
+ ''
+ )}
+
+
+
+
+
+
+ {teamDetail.teamContent}
+
+ {teamDetail.teamMates?.map((mate, idx) => {
+ const isConnectedUp =
+ (idx > 0 &&
+ teamDetail.teamMates[idx - 1].coalition === mate.coalition) ||
+ false;
+ const isConnectedDown =
+ (idx < teamDetail.teamMates.length - 1 &&
+ teamDetail.teamMates[idx + 1].coalition === mate.coalition) ||
+ false;
+ return (
+
+
+
+
+
+ );
+ })}
+
+
+
+ + {mate.intraId}{' '} + {mate.intraId === teamDetail.teamLeaderIntraId ? '👑' : ''} +
+
+
+ 참여인원
+ {`${teamDetail.teamMates.length} / ${maxPeople}`}
+
+
+
+ );
+};
+
+export default TeamInfo;
diff --git a/components/agenda/utils/AgendaLoading.tsx b/components/agenda/utils/AgendaLoading.tsx
new file mode 100644
index 000000000..b5da4a36a
--- /dev/null
+++ b/components/agenda/utils/AgendaLoading.tsx
@@ -0,0 +1,11 @@
+import styles from 'styles/agenda/utils/AgendaLoading.module.scss';
+
+const AgendaLoading = () => {
+ return (
+ 팀 수정하기
+
+
+
+ );
+};
+
+export default AgendaLoading;
diff --git a/components/agenda/utils/AgendaTag.tsx b/components/agenda/utils/AgendaTag.tsx
new file mode 100644
index 000000000..aba33abe6
--- /dev/null
+++ b/components/agenda/utils/AgendaTag.tsx
@@ -0,0 +1,20 @@
+import styles from 'styles/agenda/utils/AgendaTag.module.scss';
+
+interface AgendaTagProps {
+ tagName: string;
+}
+
+const AgendaTag: React.FC#{tagName}
+ );
+};
+
+const DefaultTag = ({ tagName }: AgendaTagProps) => {
+ if (!tagName) return null;
+ return #{tagName}
;
+};
+
+export { AgendaTag, DefaultTag };
diff --git a/components/agenda/utils/AgendaTags.tsx b/components/agenda/utils/AgendaTags.tsx
new file mode 100644
index 000000000..f14e8a618
--- /dev/null
+++ b/components/agenda/utils/AgendaTags.tsx
@@ -0,0 +1,46 @@
+import { AgendaDataProps } from 'types/agenda/agendaDetail/agendaTypes';
+import { AgendaLocation, AgendaStatus } from 'constants/agenda/agenda';
+import { DefaultTag } from 'components/agenda/utils/AgendaTag';
+import styles from 'styles/agenda/utils/AgendaTag.module.scss';
+
+interface TagProps {
+ agendaStatus?: AgendaStatus;
+ agendaLocation: AgendaLocation;
+ isOfficial: boolean;
+ agendaMaxPeople: number;
+ isRanking?: boolean;
+}
+
+const AgendaTags = (data: TagProps) => {
+ const statusToTagName: Record
+ {tags.map((tagName) => (
+
+ );
+};
+
+export default AgendaTags;
diff --git a/components/agenda/utils/ColorList.tsx b/components/agenda/utils/ColorList.tsx
new file mode 100644
index 000000000..124fd09f8
--- /dev/null
+++ b/components/agenda/utils/ColorList.tsx
@@ -0,0 +1,23 @@
+import { ColorListProps, colorMapping } from 'types/agenda/utils/colorList';
+import styles from 'styles/agenda/utils/colorList.module.scss';
+
+export default function ColorList({
+ peopleCount,
+ totalPeople,
+}: ColorListProps) {
+ return (
+
+ {Object.keys(peopleCount).map((key) => {
+ const percentage = (peopleCount[key] / totalPeople) * 100;
+
+ return (
+
+ );
+ })}
+
+ );
+}
diff --git a/components/agenda/utils/CustomImage.tsx b/components/agenda/utils/CustomImage.tsx
new file mode 100644
index 000000000..87ae26f23
--- /dev/null
+++ b/components/agenda/utils/CustomImage.tsx
@@ -0,0 +1,64 @@
+import Image from 'next/image';
+import classNames from 'classnames';
+import { MouseEvent, useState } from 'react';
+import { CustomImageProps } from 'types/agenda/utils/customImageTypes';
+import styles from 'styles/agenda/utils/CustomImage.module.scss';
+
+// 해당 컴포넌트 부모 태그에서 width, height 설정해야 합니다.
+const CustomImage = ({
+ src,
+ 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
+ ? setImgSrc('/image/agenda/default-profile.svg')
+ : setImgSrc('/image/agenda/42-icon.svg');
+ };
+
+ const handleMouseEnter = (e: MouseEvent
+
+ ) : null;
+};
+
+export default CustomImage;
diff --git a/components/agenda/utils/PageController.tsx b/components/agenda/utils/PageController.tsx
new file mode 100644
index 000000000..9b9f62365
--- /dev/null
+++ b/components/agenda/utils/PageController.tsx
@@ -0,0 +1,124 @@
+import { useEffect, useState } from 'react';
+import { AgendaDataProps } from 'types/agenda/agendaDetail/agendaTypes';
+import { instanceInAgenda } from 'utils/axios';
+import AgendaInfo from 'components/agenda/Home/AgendaInfo';
+import styles from 'styles/agenda/utils/PageController.module.scss';
+
+interface PageControllerNavigatorProps {
+ currentPage: number;
+ maxPage: number;
+ onClick: (page: number) => void;
+}
+
+const PageControllerNavigator = ({
+ currentPage,
+ maxPage,
+ onClick,
+}: PageControllerNavigatorProps) => {
+ const buttons = [];
+ for (let i = 0; i < maxPage; i++) {
+ if (i === currentPage)
+ buttons.push(
+
+
+ )}
+ {name}
+ {description}
+
-
+
diff --git a/components/Layout/HeaderContext.tsx b/components/takgu/Layout/HeaderContext.tsx
similarity index 100%
rename from components/Layout/HeaderContext.tsx
rename to components/takgu/Layout/HeaderContext.tsx
diff --git a/components/Layout/LoudSpeaker.tsx b/components/takgu/Layout/LoudSpeaker.tsx
similarity index 93%
rename from components/Layout/LoudSpeaker.tsx
rename to components/takgu/Layout/LoudSpeaker.tsx
index 856af5c80..74aadfa37 100644
--- a/components/Layout/LoudSpeaker.tsx
+++ b/components/takgu/Layout/LoudSpeaker.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import styles from 'styles/Layout/LoudSpeaker.module.scss';
+import styles from 'styles/takgu/Layout/LoudSpeaker.module.scss';
const LoudSpeaker = () => {
return (
diff --git a/components/Layout/MainPageProfile.tsx b/components/takgu/Layout/MainPageProfile.tsx
similarity index 72%
rename from components/Layout/MainPageProfile.tsx
rename to components/takgu/Layout/MainPageProfile.tsx
index 17dee59f7..0950ef885 100644
--- a/components/Layout/MainPageProfile.tsx
+++ b/components/takgu/Layout/MainPageProfile.tsx
@@ -1,7 +1,7 @@
import Link from 'next/link';
-import PlayerImage from 'components/PlayerImage';
-import { useUser } from 'hooks/Layout/useUser';
-import styles from 'styles/Layout/MainPageProfile.module.scss';
+import PlayerImage from 'components/takgu/PlayerImage';
+import { useUser } from 'hooks/takgu/Layout/useUser';
+import styles from 'styles/takgu/Layout/MainPageProfile.module.scss';
const MainPageProfile = () => {
const user = useUser();
@@ -10,10 +10,10 @@ const MainPageProfile = () => {
return (
-
+
{
size={50}
/>
-
+
{user.intraId}
님
diff --git a/components/Layout/MegaPhone.tsx b/components/takgu/Layout/MegaPhone.tsx
similarity index 97%
rename from components/Layout/MegaPhone.tsx
rename to components/takgu/Layout/MegaPhone.tsx
index f276197fe..46bf4d0e2 100644
--- a/components/Layout/MegaPhone.tsx
+++ b/components/takgu/Layout/MegaPhone.tsx
@@ -1,10 +1,10 @@
import { useRouter } from 'next/router';
import { useState, useEffect, useRef } from 'react';
import { Virtuoso, VirtuosoHandle } from 'react-virtuoso';
-import { Item } from 'types/itemTypes';
+import { Item } from 'types/takgu/itemTypes';
import useAxiosGet from 'hooks/useAxiosGet';
import useInterval from 'hooks/useInterval';
-import styles from 'styles/Layout/MegaPhone.module.scss';
+import styles from 'styles/takgu/Layout/MegaPhone.module.scss';
interface IMegaphoneContent {
megaphoneId?: number;
diff --git a/components/Layout/MenuBar/MenuBar.tsx b/components/takgu/Layout/MenuBar/MenuBar.tsx
similarity index 84%
rename from components/Layout/MenuBar/MenuBar.tsx
rename to components/takgu/Layout/MenuBar/MenuBar.tsx
index 1d6b22cd2..66b019848 100644
--- a/components/Layout/MenuBar/MenuBar.tsx
+++ b/components/takgu/Layout/MenuBar/MenuBar.tsx
@@ -3,11 +3,14 @@ import React, { useContext } from 'react';
import {
HeaderContextState,
HeaderContext,
-} from 'components/Layout/HeaderContext';
-import { MainMenu, AdminMenu } from 'components/Layout/MenuBar/MenuBarElement';
-import PlayerImage from 'components/PlayerImage';
-import { useUser } from 'hooks/Layout/useUser';
-import styles from 'styles/Layout/MenuBar.module.scss';
+} from 'components/takgu/Layout/HeaderContext';
+import {
+ MainMenu,
+ AdminMenu,
+} from 'components/takgu/Layout/MenuBar/MenuBarElement';
+import PlayerImage from 'components/takgu/PlayerImage';
+import { useUser } from 'hooks/takgu/Layout/useUser';
+import styles from 'styles/takgu/Layout/MenuBar.module.scss';
const MenuTop = () => {
const HeaderState = useContext(HeaderContext);
@@ -39,7 +42,7 @@ const MenuProfile = () => {
{
{user.intraId}
diff --git a/components/Layout/MenuBar/MenuBarElement.tsx b/components/takgu/Layout/MenuBar/MenuBarElement.tsx
similarity index 74%
rename from components/Layout/MenuBar/MenuBarElement.tsx
rename to components/takgu/Layout/MenuBar/MenuBarElement.tsx
index 3225f5ca8..15a18513c 100644
--- a/components/Layout/MenuBar/MenuBarElement.tsx
+++ b/components/takgu/Layout/MenuBar/MenuBarElement.tsx
@@ -2,26 +2,27 @@ import Link from 'next/link';
import React, { MouseEvent, useContext, MouseEventHandler } from 'react';
import { useSetRecoilState } from 'recoil';
import { AiFillShop } from 'react-icons/ai';
-import { Modal } from 'types/modalTypes';
-import { modalState } from 'utils/recoil/modal';
+import { Modal } from 'types/takgu/modalTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
import {
HeaderContextState,
HeaderContext,
-} from 'components/Layout/HeaderContext';
-import AdminEmoji from 'public/image/menu_admin.svg';
-import AnnouncementEmoji from 'public/image/menu_announcement.svg';
-import CurrentMatchEmoji from 'public/image/menu_currentMatch.svg';
-import HallOfFameEmoji from 'public/image/menu_halloffame.svg';
-import ManualEmoji from 'public/image/menu_manual.svg';
-import RankingEmoji from 'public/image/menu_ranking.svg';
-import RecruitEmoji from 'public/image/menu_recruit.svg';
-import ReportEmoji from 'public/image/menu_report.svg';
-import SignOutEmoji from 'public/image/menu_signOut.svg';
-import StatisticsEmoji from 'public/image/menu_statistics.svg';
-import { useUser } from 'hooks/Layout/useUser';
-import useCheckRecruit from 'hooks/recruit/useCheckRecruit';
+} from 'components/takgu/Layout/HeaderContext';
+import AdminEmoji from 'public/image/takgu/menu_admin.svg';
+import AnnouncementEmoji from 'public/image/takgu/menu_announcement.svg';
+import CurrentMatchEmoji from 'public/image/takgu/menu_currentMatch.svg';
+import HallOfFameEmoji from 'public/image/takgu/menu_halloffame.svg';
+import HomeEmoji from 'public/image/takgu/menu_home.svg';
+import ManualEmoji from 'public/image/takgu/menu_manual.svg';
+import RankingEmoji from 'public/image/takgu/menu_ranking.svg';
+import RecruitEmoji from 'public/image/takgu/menu_recruit.svg';
+import ReportEmoji from 'public/image/takgu/menu_report.svg';
+import SignOutEmoji from 'public/image/takgu/menu_signOut.svg';
+import StatisticsEmoji from 'public/image/takgu/menu_statistics.svg';
+import { useUser } from 'hooks/takgu/Layout/useUser';
+import useCheckRecruit from 'hooks/takgu/recruit/useCheckRecruit';
import useAxiosGet from 'hooks/useAxiosGet';
-import styles from 'styles/Layout/MenuBar.module.scss';
+import styles from 'styles/takgu/Layout/MenuBar.module.scss';
interface MenuLinkProps {
link: string;
@@ -75,6 +76,10 @@ const MenuItem = ({ itemName, onClick }: menuItemProps) => {
name: '지원하기',
svg:
@@ -92,7 +97,7 @@ const MenuItem = ({ itemName, onClick }: menuItemProps) => {
const MenuLink = ({ link, onClick, itemName }: MenuLinkProps) => {
return (
-
+
);
@@ -126,6 +131,12 @@ export const MainMenu = () => {
onClick={HeaderState?.resetOpenMenuBarState}
/>
)}
+
+
+
{
{isAdmin && (
diff --git a/components/Layout/NotiBar/NotiBar.tsx b/components/takgu/Layout/NotiBar/NotiBar.tsx
similarity index 92%
rename from components/Layout/NotiBar/NotiBar.tsx
rename to components/takgu/Layout/NotiBar/NotiBar.tsx
index 2b65609b1..f93b17367 100644
--- a/components/Layout/NotiBar/NotiBar.tsx
+++ b/components/takgu/Layout/NotiBar/NotiBar.tsx
@@ -1,19 +1,19 @@
import { useContext, useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { Noti } from 'types/notiTypes';
+import { Noti } from 'types/takgu/notiTypes';
import { instance } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
import {
HeaderContextState,
HeaderContext,
-} from 'components/Layout/HeaderContext';
+} from 'components/takgu/Layout/HeaderContext';
import NotiStateContext, {
NotiContextState,
NotiProvider,
-} from 'components/Layout/NotiBar/NotiContext';
-import NotiItem from 'components/Layout/NotiBar/NotiItem';
-import NotiEmptyEmoji from 'public/image/noti_empty.svg';
-import styles from 'styles/Layout/NotiBar.module.scss';
+} from 'components/takgu/Layout/NotiBar/NotiContext';
+import NotiItem from 'components/takgu/Layout/NotiBar/NotiItem';
+import NotiEmptyEmoji from 'public/image/takgu/noti_empty.svg';
+import styles from 'styles/takgu/Layout/NotiBar.module.scss';
export default function NotiBar() {
const HeaderState = useContext(HeaderContext);
diff --git a/components/Layout/NotiBar/NotiContext.tsx b/components/takgu/Layout/NotiBar/NotiContext.tsx
similarity index 91%
rename from components/Layout/NotiBar/NotiContext.tsx
rename to components/takgu/Layout/NotiBar/NotiContext.tsx
index 00dc928ea..fc6979d82 100644
--- a/components/Layout/NotiBar/NotiContext.tsx
+++ b/components/takgu/Layout/NotiBar/NotiContext.tsx
@@ -1,5 +1,11 @@
-import { Dispatch, SetStateAction, createContext, useState, useEffect } from 'react';
-import { Noti } from 'types/notiTypes';
+import {
+ Dispatch,
+ SetStateAction,
+ createContext,
+ useState,
+ useEffect,
+} from 'react';
+import { Noti } from 'types/takgu/notiTypes';
import useAxiosGet from 'hooks/useAxiosGet';
import useReloadHandler from 'hooks/useReloadHandler';
diff --git a/components/Layout/NotiBar/NotiItem.tsx b/components/takgu/Layout/NotiBar/NotiItem.tsx
similarity index 92%
rename from components/Layout/NotiBar/NotiItem.tsx
rename to components/takgu/Layout/NotiBar/NotiItem.tsx
index c456b4a7e..cfa75c2ba 100644
--- a/components/Layout/NotiBar/NotiItem.tsx
+++ b/components/takgu/Layout/NotiBar/NotiItem.tsx
@@ -1,12 +1,12 @@
import Link from 'next/link';
import { useContext } from 'react';
import { BsCheckLg } from 'react-icons/bs';
-import { Noti } from 'types/notiTypes';
+import { Noti } from 'types/takgu/notiTypes';
import {
HeaderContextState,
HeaderContext,
-} from 'components/Layout/HeaderContext';
-import styles from 'styles/Layout/NotiItem.module.scss';
+} from 'components/takgu/Layout/HeaderContext';
+import styles from 'styles/takgu/Layout/NotiItem.module.scss';
interface NotiItemProps {
data: Noti;
@@ -106,7 +106,7 @@ function MakeImminentContent(message: string) {
key={intraId}
onClick={() => HeaderState?.resetOpenNotiBarState()}
>
- {intraId}
+ {intraId}
{enemyId && i < enemyId.length - 1 ? ', ' : ''}
))}
diff --git a/components/Layout/PlayButton.tsx b/components/takgu/Layout/PlayButton.tsx
similarity index 57%
rename from components/Layout/PlayButton.tsx
rename to components/takgu/Layout/PlayButton.tsx
index 0b87f853b..c5ed5a9cc 100644
--- a/components/Layout/PlayButton.tsx
+++ b/components/takgu/Layout/PlayButton.tsx
@@ -1,21 +1,21 @@
import { useRouter } from 'next/router';
-import StyledButton from 'components/UI/StyledButton';
-import styles from 'styles/Layout/Layout.module.scss';
+import StyledButton from 'components/takgu/UI/StyledButton';
+import styles from 'styles/takgu/Layout/Layout.module.scss';
const PlayButton = () => {
const presentPath = useRouter().asPath;
const router = useRouter();
const onClickMatch = () => {
- router.replace('/');
- router.push(`/match`);
+ router.replace('/takgu');
+ router.push(`/takgu/match`);
};
if (
- presentPath === '/match' ||
- presentPath === '/manual' ||
- presentPath === '/store' ||
- presentPath.startsWith('/party')
+ presentPath === '/takgu/match' ||
+ presentPath === '/takgu/manual' ||
+ presentPath === '/takgu/store' ||
+ presentPath.startsWith('/takgu/party')
)
return null;
return (
diff --git a/components/Layout/UserLayout.tsx b/components/takgu/Layout/UserLayout.tsx
similarity index 81%
rename from components/Layout/UserLayout.tsx
rename to components/takgu/Layout/UserLayout.tsx
index faf4f6d81..3b678e8a9 100644
--- a/components/Layout/UserLayout.tsx
+++ b/components/takgu/Layout/UserLayout.tsx
@@ -1,6 +1,6 @@
import { useRecoilValue } from 'recoil';
-import { colorModeState } from 'utils/recoil/colorMode';
-import styles from 'styles/Layout/Layout.module.scss';
+import { colorModeState } from 'utils/recoil/takgu/colorMode';
+import styles from 'styles/takgu/Layout/Layout.module.scss';
const UserLayout = ({ children }: { children: React.ReactNode }) => {
const colorMode = useRecoilValue(colorModeState);
diff --git a/components/PlayerImage.tsx b/components/takgu/PlayerImage.tsx
similarity index 87%
rename from components/PlayerImage.tsx
rename to components/takgu/PlayerImage.tsx
index 8fd0c3d53..be62d6401 100644
--- a/components/PlayerImage.tsx
+++ b/components/takgu/PlayerImage.tsx
@@ -1,7 +1,7 @@
import Image from 'next/legacy/image';
import { useState } from 'react';
-import fallBack from 'public/image/fallBackSrc.jpeg';
-import styles from 'styles/PlayerImage.module.scss';
+import fallBack from 'public/image/takgu/fallBackSrc.jpeg';
+import styles from 'styles/takgu/PlayerImage.module.scss';
interface PlayerImageProps {
src: string;
diff --git a/components/UI/BouncingDots.tsx b/components/takgu/UI/BouncingDots.tsx
similarity index 78%
rename from components/UI/BouncingDots.tsx
rename to components/takgu/UI/BouncingDots.tsx
index 2485d3378..57a922c9c 100644
--- a/components/UI/BouncingDots.tsx
+++ b/components/takgu/UI/BouncingDots.tsx
@@ -1,4 +1,4 @@
-import styles from 'styles/UI/BouncingDots.module.scss';
+import styles from 'styles/takgu/UI/BouncingDots.module.scss';
export default function BouncingDots() {
return (
diff --git a/components/UI/DraggableList.tsx b/components/takgu/UI/DraggableList.tsx
similarity index 96%
rename from components/UI/DraggableList.tsx
rename to components/takgu/UI/DraggableList.tsx
index 396d1ffda..02983ce75 100644
--- a/components/UI/DraggableList.tsx
+++ b/components/takgu/UI/DraggableList.tsx
@@ -6,7 +6,7 @@ import {
Draggable,
} from 'react-beautiful-dnd';
import { ListItem, ListItemAvatar, makeStyles } from '@mui/material';
-import styles from 'styles/UI/DraggableList.module.scss';
+import styles from 'styles/takgu/UI/DraggableList.module.scss';
export type DraggableListProps = {
children: React.ReactNode[];
diff --git a/components/UI/EmptyImage.tsx b/components/takgu/UI/EmptyImage.tsx
similarity index 72%
rename from components/UI/EmptyImage.tsx
rename to components/takgu/UI/EmptyImage.tsx
index 64fd292aa..76e9bc48e 100644
--- a/components/UI/EmptyImage.tsx
+++ b/components/takgu/UI/EmptyImage.tsx
@@ -1,5 +1,5 @@
-import NotiEmptyEmoji from 'public/image/noti_empty.svg';
-import styles from 'styles/UI/EmptyImage.module.scss';
+import NotiEmptyEmoji from 'public/image/takgu/noti_empty.svg';
+import styles from 'styles/takgu/UI/EmptyImage.module.scss';
function EmptyImage() {
return (
diff --git a/components/UI/LoadingSpinner.tsx b/components/takgu/UI/LoadingSpinner.tsx
similarity index 60%
rename from components/UI/LoadingSpinner.tsx
rename to components/takgu/UI/LoadingSpinner.tsx
index b8f5e4620..a3a02e5cd 100644
--- a/components/UI/LoadingSpinner.tsx
+++ b/components/takgu/UI/LoadingSpinner.tsx
@@ -1,4 +1,4 @@
-import styles from 'styles/UI/LoadingSpinner.module.scss';
+import styles from 'styles/takgu/UI/LoadingSpinner.module.scss';
export default function LoadingSpinner() {
return ;
diff --git a/components/UI/StyledButton.tsx b/components/takgu/UI/StyledButton.tsx
similarity index 88%
rename from components/UI/StyledButton.tsx
rename to components/takgu/UI/StyledButton.tsx
index d5d44b9cf..4cbd00372 100644
--- a/components/UI/StyledButton.tsx
+++ b/components/takgu/UI/StyledButton.tsx
@@ -1,5 +1,5 @@
import { MouseEventHandler } from 'react';
-import styles from 'styles/UI/StyledButton.module.scss';
+import styles from 'styles/takgu/UI/StyledButton.module.scss';
type StyledButtonProps = {
onClick: MouseEventHandler;
diff --git a/components/game/GameResult.tsx b/components/takgu/game/GameResult.tsx
similarity index 61%
rename from components/game/GameResult.tsx
rename to components/takgu/game/GameResult.tsx
index 90e9a7840..3e70ce637 100644
--- a/components/game/GameResult.tsx
+++ b/components/takgu/game/GameResult.tsx
@@ -1,6 +1,6 @@
-import { SeasonMode } from 'types/mainType';
-import GameResultList from 'components/game/GameResultList';
-import useGameResult from 'hooks/game/useGameResult';
+import { SeasonMode } from 'types/takgu/mainType';
+import GameResultList from 'components/takgu/game/GameResultList';
+import useGameResult from 'hooks/takgu/game/useGameResult';
interface GameResultProps {
mode?: SeasonMode;
diff --git a/components/game/GameResultEmptyItem.tsx b/components/takgu/game/GameResultEmptyItem.tsx
similarity index 88%
rename from components/game/GameResultEmptyItem.tsx
rename to components/takgu/game/GameResultEmptyItem.tsx
index a5ec31c10..ade5dd026 100644
--- a/components/game/GameResultEmptyItem.tsx
+++ b/components/takgu/game/GameResultEmptyItem.tsx
@@ -1,4 +1,4 @@
-import styles from 'styles/game/GameResultEmpty.module.scss';
+import styles from 'styles/takgu/game/GameResultEmpty.module.scss';
interface GameResultEmptyItemProps {
status: string;
diff --git a/components/game/GameResultList.tsx b/components/takgu/game/GameResultList.tsx
similarity index 80%
rename from components/game/GameResultList.tsx
rename to components/takgu/game/GameResultList.tsx
index a2d097e11..d36f36f03 100644
--- a/components/game/GameResultList.tsx
+++ b/components/takgu/game/GameResultList.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { FaChevronDown } from 'react-icons/fa';
-import { Game } from 'types/gameTypes';
-import { SeasonMode } from 'types/mainType';
-import GameResultBigItem from 'components/game/big/GameResultBigItem';
-import GameResultEmptyItem from 'components/game/GameResultEmptyItem';
-import GameResultSmallItem from 'components/game/small/GameResultSmallItem';
-import useGameResultList from 'hooks/game/useGameResultList';
-import styles from 'styles/game/GameResultItem.module.scss';
+import { Game } from 'types/takgu/gameTypes';
+import { SeasonMode } from 'types/takgu/mainType';
+import GameResultBigItem from 'components/takgu/game/big/GameResultBigItem';
+import GameResultEmptyItem from 'components/takgu/game/GameResultEmptyItem';
+import GameResultSmallItem from 'components/takgu/game/small/GameResultSmallItem';
+import useGameResultList from 'hooks/takgu/game/useGameResultList';
+import styles from 'styles/takgu/game/GameResultItem.module.scss';
interface GameResultListProps {
path: string;
diff --git a/components/game/GameScore.ts b/components/takgu/game/GameScore.ts
similarity index 85%
rename from components/game/GameScore.ts
rename to components/takgu/game/GameScore.ts
index 69961147a..78fe8f494 100644
--- a/components/game/GameScore.ts
+++ b/components/takgu/game/GameScore.ts
@@ -1,4 +1,4 @@
-import { GameStatus, GameMode } from 'types/gameTypes';
+import { GameStatus, GameMode } from 'types/takgu/gameTypes';
export default function gameScore(
type: 'BIG' | 'SMALL',
diff --git a/components/game/big/GameResultBigItem.tsx b/components/takgu/game/big/GameResultBigItem.tsx
similarity index 67%
rename from components/game/big/GameResultBigItem.tsx
rename to components/takgu/game/big/GameResultBigItem.tsx
index 8abb42490..2bcaeb788 100644
--- a/components/game/big/GameResultBigItem.tsx
+++ b/components/takgu/game/big/GameResultBigItem.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { useRecoilValue, useSetRecoilState } from 'recoil';
-import { Game } from 'types/gameTypes';
-import { SeasonMode } from 'types/mainType';
-import { clickedGameItemState } from 'utils/recoil/game';
-import { profileState } from 'utils/recoil/user';
-import GameResultBigScore from 'components/game/big/GameResultBigScore';
-import GameResultBigTeam from 'components/game/big/GameResultBigTeam';
-import styles from 'styles/game/GameResultItem.module.scss';
+import { Game } from 'types/takgu/gameTypes';
+import { SeasonMode } from 'types/takgu/mainType';
+import { clickedGameItemState } from 'utils/recoil/takgu/game';
+import { profileState } from 'utils/recoil/takgu/user';
+import GameResultBigScore from 'components/takgu/game/big/GameResultBigScore';
+import GameResultBigTeam from 'components/takgu/game/big/GameResultBigTeam';
+import styles from 'styles/takgu/game/GameResultItem.module.scss';
interface GameResultBigItemProps {
game: Game;
@@ -29,8 +29,8 @@ function GameResultBigItem({
setClickedItemId(gameId)}
id={String(gameId)}
- className={`${styles['bigItemContainer']}
- ${zIndexList ? styles['zIndexList'] : ''}
+ className={`${styles['bigItemContainer']}
+ ${zIndexList ? styles['zIndexList'] : ''}
${page === 'profile' ? styles[background.toLowerCase()] : styles[page]}
${radioMode ? styles[radioMode.toLowerCase()] : ''}`}
>
diff --git a/components/game/big/GameResultBigScore.tsx b/components/takgu/game/big/GameResultBigScore.tsx
similarity index 86%
rename from components/game/big/GameResultBigScore.tsx
rename to components/takgu/game/big/GameResultBigScore.tsx
index c54429592..06096aee8 100644
--- a/components/game/big/GameResultBigScore.tsx
+++ b/components/takgu/game/big/GameResultBigScore.tsx
@@ -1,8 +1,8 @@
-import { GameStatus, GameMode } from 'types/gameTypes';
-import { SeasonMode } from 'types/mainType';
+import { GameStatus, GameMode } from 'types/takgu/gameTypes';
+import { SeasonMode } from 'types/takgu/mainType';
import { getTimeAgo } from 'utils/handleTime';
-import gameScore from 'components/game/GameScore';
-import styles from 'styles/game/GameResultItem.module.scss';
+import gameScore from 'components/takgu/game/GameScore';
+import styles from 'styles/takgu/game/GameResultItem.module.scss';
interface GameResultBigScoreProps {
mode: GameMode;
@@ -61,7 +61,7 @@ function ScoreStatus({ status, time, page, radioMode }: scoreStatusProps) {
case 'END':
return (
{getTimeAgo(time)}
diff --git a/components/game/big/GameResultBigTeam.tsx b/components/takgu/game/big/GameResultBigTeam.tsx
similarity index 76%
rename from components/game/big/GameResultBigTeam.tsx
rename to components/takgu/game/big/GameResultBigTeam.tsx
index ab7181c34..66269d62d 100644
--- a/components/game/big/GameResultBigTeam.tsx
+++ b/components/takgu/game/big/GameResultBigTeam.tsx
@@ -1,7 +1,7 @@
import Link from 'next/link';
-import { Team, Player, RankPlayer } from 'types/gameTypes';
-import PlayerImage from 'components/PlayerImage';
-import styles from 'styles/game/GameResultItem.module.scss';
+import { Team, Player, RankPlayer } from 'types/takgu/gameTypes';
+import PlayerImage from 'components/takgu/PlayerImage';
+import styles from 'styles/takgu/game/GameResultItem.module.scss';
interface GameResultBigTeamProps {
team: Team;
@@ -20,7 +20,7 @@ export default function GameResultBigTeam({
{team.players.map((player, index) => (
-
+
{isRankPlayerType(player)
diff --git a/components/game/small/GameResultSmallItem.tsx b/components/takgu/game/small/GameResultSmallItem.tsx
similarity index 69%
rename from components/game/small/GameResultSmallItem.tsx
rename to components/takgu/game/small/GameResultSmallItem.tsx
index 61bbd30aa..8fe4ab369 100644
--- a/components/game/small/GameResultSmallItem.tsx
+++ b/components/takgu/game/small/GameResultSmallItem.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { useRecoilValue, useSetRecoilState } from 'recoil';
-import { Game } from 'types/gameTypes';
-import { SeasonMode } from 'types/mainType';
-import { clickedGameItemState } from 'utils/recoil/game';
-import { profileState } from 'utils/recoil/user';
-import GameResultSmallScore from 'components/game/small/GameResultSmallScore';
-import GameResultSmallTeam from 'components/game/small/GameResultSmallTeam';
-import styles from 'styles/game/GameResultItem.module.scss';
+import { Game } from 'types/takgu/gameTypes';
+import { SeasonMode } from 'types/takgu/mainType';
+import { clickedGameItemState } from 'utils/recoil/takgu/game';
+import { profileState } from 'utils/recoil/takgu/user';
+import GameResultSmallScore from 'components/takgu/game/small/GameResultSmallScore';
+import GameResultSmallTeam from 'components/takgu/game/small/GameResultSmallTeam';
+import styles from 'styles/takgu/game/GameResultItem.module.scss';
interface GameResultSmallItemProps {
game: Game;
@@ -31,10 +31,10 @@ function GameResultSmallItem({
setClickedItemId(gameId)}
id={String(gameId)}
- className={`${styles['smallItemContainer']}
+ className={`${styles['smallItemContainer']}
${styles[type.toLowerCase()]}
${page === 'profile' ? styles[background.toLowerCase()] : styles[page]}
- ${radioMode !== undefined ? styles[radioMode.toLowerCase()] : ''}
+ ${radioMode !== undefined ? styles[radioMode.toLowerCase()] : ''}
${zIndexList ? styles['zIndexList'] : ''}`}
>
diff --git a/components/main/SearchBar.tsx b/components/takgu/main/SearchBar.tsx
similarity index 87%
rename from components/main/SearchBar.tsx
rename to components/takgu/main/SearchBar.tsx
index 786d3a54e..f4cbd7b23 100644
--- a/components/main/SearchBar.tsx
+++ b/components/takgu/main/SearchBar.tsx
@@ -2,7 +2,7 @@ import Link from 'next/link';
import { GoSearch } from 'react-icons/go';
import { IoIosCloseCircle } from 'react-icons/io';
import useSearchBar from 'hooks/useSearchBar';
-import styles from 'styles/main/SearchBar.module.scss';
+import styles from 'styles/takgu/main/SearchBar.module.scss';
export default function SearchBar() {
const {
@@ -42,7 +42,10 @@ export default function SearchBar() {
{searchResult.length ? (
searchResult.map((intraId: string) => (
-
+
{intraId}
))
diff --git a/components/main/Section.tsx b/components/takgu/main/Section.tsx
similarity index 73%
rename from components/main/Section.tsx
rename to components/takgu/main/Section.tsx
index 67e561f73..ec3346136 100644
--- a/components/main/Section.tsx
+++ b/components/takgu/main/Section.tsx
@@ -1,10 +1,10 @@
import { useRouter } from 'next/router';
import React from 'react';
import { FaChevronRight } from 'react-icons/fa';
-import GameResult from 'components/game/GameResult';
-import TournamentPreview from 'components/main/TournamentPreview';
-import RankListMain from 'components/rank/topRank/RankListMain';
-import styles from 'styles/main/Section.module.scss';
+import GameResult from 'components/takgu/game/GameResult';
+import TournamentPreview from 'components/takgu/main/TournamentPreview';
+import RankListMain from 'components/takgu/rank/topRank/RankListMain';
+import styles from 'styles/takgu/main/Section.module.scss';
import PartyPreview from './PartyPreview';
type SectionProps = {
@@ -31,7 +31,7 @@ export default function Section({ sectionTitle, path }: SectionProps) {
>
{sectionTitle}
-
diff --git a/components/main/TournamentPreview.tsx b/components/takgu/main/TournamentPreview.tsx
similarity index 81%
rename from components/main/TournamentPreview.tsx
rename to components/takgu/main/TournamentPreview.tsx
index 3a4896c36..14893e831 100644
--- a/components/main/TournamentPreview.tsx
+++ b/components/takgu/main/TournamentPreview.tsx
@@ -1,10 +1,10 @@
import { useRouter } from 'next/router';
import { useState, useRef } from 'react';
import { Virtuoso, VirtuosoHandle } from 'react-virtuoso';
-import TournamentCard from 'components/tournament/TournamentCard';
-import useBeforeLiveTournamentData from 'hooks/tournament/useBeforeLiveTournamentData';
+import TournamentCard from 'components/takgu/tournament/TournamentCard';
+import useBeforeLiveTournamentData from 'hooks/takgu/tournament/useBeforeLiveTournamentData';
import useInterval from 'hooks/useInterval';
-import styles from 'styles/main/TournamentPreview.module.scss';
+import styles from 'styles/takgu/main/TournamentPreview.module.scss';
export default function TournamentPreview() {
const { data } = useBeforeLiveTournamentData();
@@ -34,7 +34,7 @@ export default function TournamentPreview() {
return (
router.push('tournament')}
+ onClick={() => router.push('/takgu/tournament')}
>
(0);
diff --git a/components/modal/admin/AdminFeedbackCheckModal.tsx b/components/takgu/modal/admin/AdminFeedbackCheckModal.tsx
similarity index 93%
rename from components/modal/admin/AdminFeedbackCheckModal.tsx
rename to components/takgu/modal/admin/AdminFeedbackCheckModal.tsx
index 9672021ad..6a4041b81 100644
--- a/components/modal/admin/AdminFeedbackCheckModal.tsx
+++ b/components/takgu/modal/admin/AdminFeedbackCheckModal.tsx
@@ -1,9 +1,9 @@
import { useSetRecoilState } from 'recoil';
import { IoSend } from 'react-icons/io5';
import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/modal/AdminFeedbackCheck.module.scss';
+import styles from 'styles/admin/takgu/modal/AdminFeedbackCheck.module.scss';
interface IfeedbackProps {
id: number;
diff --git a/components/modal/admin/AdminModifyScoreModal.tsx b/components/takgu/modal/admin/AdminModifyScoreModal.tsx
similarity index 88%
rename from components/modal/admin/AdminModifyScoreModal.tsx
rename to components/takgu/modal/admin/AdminModifyScoreModal.tsx
index 5333363ae..cab525b1f 100644
--- a/components/modal/admin/AdminModifyScoreModal.tsx
+++ b/components/takgu/modal/admin/AdminModifyScoreModal.tsx
@@ -1,10 +1,10 @@
import { useSetRecoilState } from 'recoil';
import { HiCheckCircle } from 'react-icons/hi';
-import { ModifyScoreType } from 'types/admin/gameLogTypes';
+import { ModifyScoreType } from 'types/admin/takgu/gameLogTypes';
import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/modal/AdminModifyScoreModal.module.scss';
+import styles from 'styles/admin/takgu/modal/AdminModifyScoreModal.module.scss';
type ModifyScoreBodyType = {
team1Score: number;
@@ -55,25 +55,25 @@ export default function AdminModifyScoreModal({
Team 1
Team 2
{team1.intraId1} {team1.intraId2}
{team2.intraId1} {team2.intraId2}
{team1.score}
{team2.score}
diff --git a/components/modal/admin/AdminNotiUserModal.tsx b/components/takgu/modal/admin/AdminNotiUserModal.tsx
similarity index 98%
rename from components/modal/admin/AdminNotiUserModal.tsx
rename to components/takgu/modal/admin/AdminNotiUserModal.tsx
index fb1b2253c..e5780dd43 100644
--- a/components/modal/admin/AdminNotiUserModal.tsx
+++ b/components/takgu/modal/admin/AdminNotiUserModal.tsx
@@ -3,9 +3,9 @@ import { useSetRecoilState } from 'recoil';
import { GoSearch } from 'react-icons/go';
import { IoIosCloseCircle } from 'react-icons/io';
import { instance, instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/modal/AdminNoti.module.scss';
+import styles from 'styles/admin/takgu/modal/AdminNoti.module.scss';
let timer: ReturnType;
diff --git a/components/modal/admin/AdminPartyPenaltyModal.tsx b/components/takgu/modal/admin/AdminPartyPenaltyModal.tsx
similarity index 94%
rename from components/modal/admin/AdminPartyPenaltyModal.tsx
rename to components/takgu/modal/admin/AdminPartyPenaltyModal.tsx
index b98f5ff84..6972f6c45 100644
--- a/components/modal/admin/AdminPartyPenaltyModal.tsx
+++ b/components/takgu/modal/admin/AdminPartyPenaltyModal.tsx
@@ -1,10 +1,13 @@
import React, { useState, useEffect } from 'react';
import { useSetRecoilState } from 'recoil';
-import { PartyPenaltyAdmin, PartyPenaltyAdminSubmit } from 'types/partyTypes';
+import {
+ PartyPenaltyAdmin,
+ PartyPenaltyAdminSubmit,
+} from 'types/takgu/partyTypes';
import { instanceInPartyManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/party/TemplateModal.module.scss';
+import styles from 'styles/takgu/party/TemplateModal.module.scss';
export default function PartyPenaltyModal({
partyPenalty,
diff --git a/components/modal/admin/AdminPenaltyModal.tsx b/components/takgu/modal/admin/AdminPenaltyModal.tsx
similarity index 96%
rename from components/modal/admin/AdminPenaltyModal.tsx
rename to components/takgu/modal/admin/AdminPenaltyModal.tsx
index f24fe1f25..bc878d75f 100644
--- a/components/modal/admin/AdminPenaltyModal.tsx
+++ b/components/takgu/modal/admin/AdminPenaltyModal.tsx
@@ -1,11 +1,11 @@
import { useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { IPenaltyInfo } from 'types/admin/adminPenaltyTypes';
+import { IPenaltyInfo } from 'types/admin/takgu/adminPenaltyTypes';
import { instanceInManage } from 'utils/axios';
import { fillZero } from 'utils/handleTime';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/modal/AdminPenalty.module.scss';
+import styles from 'styles/admin/takgu/modal/AdminPenalty.module.scss';
export default function AdminPenaltyModal(props: { intraId: string }) {
const [penaltyInfo, setPenaltyInfo] = useState({
diff --git a/components/modal/admin/AdminProfileModal.tsx b/components/takgu/modal/admin/AdminProfileModal.tsx
similarity index 95%
rename from components/modal/admin/AdminProfileModal.tsx
rename to components/takgu/modal/admin/AdminProfileModal.tsx
index 5b2a0ccba..dd884455e 100644
--- a/components/modal/admin/AdminProfileModal.tsx
+++ b/components/takgu/modal/admin/AdminProfileModal.tsx
@@ -1,13 +1,13 @@
import Image from 'next/legacy/image';
import { useEffect, useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { roleTypes, IUserInfo } from 'types/admin/adminUserTypes';
-import { racketTypes } from 'types/userTypes';
+import { roleTypes, IUserInfo } from 'types/admin/takgu/adminUserTypes';
+import { racketTypes } from 'types/takgu/userTypes';
import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import useUploadImg from 'hooks/useUploadImg';
-import styles from 'styles/admin/modal/AdminProfile.module.scss';
+import styles from 'styles/admin/takgu/modal/AdminProfile.module.scss';
const STAT_MSG_LIMIT = 30;
@@ -93,7 +93,10 @@ export default function AdminProfileModal(props: { intraId: string }) {
})
);
if (imgData) {
- formData.append('imgData', new Blob([imgData], { type: 'image/jpeg' }));
+ formData.append(
+ 'imgData',
+ new Blob([imgData], { type: 'image/takgu/jpeg' })
+ );
}
try {
const res = await instanceInManage.put(
diff --git a/components/modal/admin/AdminRecruitMessageTemplateModal.tsx b/components/takgu/modal/admin/AdminRecruitMessageTemplateModal.tsx
similarity index 87%
rename from components/modal/admin/AdminRecruitMessageTemplateModal.tsx
rename to components/takgu/modal/admin/AdminRecruitMessageTemplateModal.tsx
index 297f77948..0e3f5ff81 100644
--- a/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
+++ b/components/takgu/modal/admin/AdminRecruitMessageTemplateModal.tsx
@@ -3,11 +3,11 @@ import { useSetRecoilState } from 'recoil';
import {
IRecruitmentTemplate,
RecruitmentMessageType,
-} from 'types/recruit/recruitments';
+} from 'types/takgu/recruit/recruitments';
import { instance } from 'utils/axios';
import { toastState } from 'utils/recoil/toast';
-import TemplateEditor from 'components/admin/recruitments/recruitmentsuser/tmplateEditor';
-import styles from 'styles/admin/modal/AdminRecruitMessageTemplateModal.module.scss';
+import TemplateEditor from 'components/admin/takgu/recruitments/recruitmentsuser/tmplateEditor';
+import styles from 'styles/admin/takgu/modal/AdminRecruitMessageTemplateModal.module.scss';
type TemplateListType = Record;
function AdminRecruitMessageTemplateModal() {
diff --git a/components/modal/admin/AdminRecruitResultModal.tsx b/components/takgu/modal/admin/AdminRecruitResultModal.tsx
similarity index 95%
rename from components/modal/admin/AdminRecruitResultModal.tsx
rename to components/takgu/modal/admin/AdminRecruitResultModal.tsx
index 5a7ccc782..5913538ba 100644
--- a/components/modal/admin/AdminRecruitResultModal.tsx
+++ b/components/takgu/modal/admin/AdminRecruitResultModal.tsx
@@ -1,9 +1,9 @@
import React, { useState, useEffect } from 'react';
import { useSetRecoilState } from 'recoil';
import { instanceInManage, instance } from 'utils/axios';
-import { dateToStringShort , dateToDateTimeLocalString } from 'utils/handleTime';
+import { dateToStringShort, dateToDateTimeLocalString } from 'utils/handleTime';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/modal/AdminRecruitMessageTemplateModal.module.scss';
+import styles from 'styles/admin/takgu/modal/AdminRecruitMessageTemplateModal.module.scss';
interface notiMessageType {
messageId: number;
diff --git a/components/modal/admin/AdminTemplateModal.tsx b/components/takgu/modal/admin/AdminTemplateModal.tsx
similarity index 94%
rename from components/modal/admin/AdminTemplateModal.tsx
rename to components/takgu/modal/admin/AdminTemplateModal.tsx
index 46535b051..7a0d30003 100644
--- a/components/modal/admin/AdminTemplateModal.tsx
+++ b/components/takgu/modal/admin/AdminTemplateModal.tsx
@@ -1,9 +1,9 @@
import React, { useState, useEffect } from 'react';
import { useSetRecoilState } from 'recoil';
-import { PartyGameTemplate, PartyTemplateForm } from 'types/partyTypes';
-import { modalState } from 'utils/recoil/modal';
-import { usePartyTemplate } from 'hooks/party/usePartyTemplate';
-import styles from 'styles/party/TemplateModal.module.scss';
+import { PartyGameTemplate, PartyTemplateForm } from 'types/takgu/partyTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { usePartyTemplate } from 'hooks/takgu/party/usePartyTemplate';
+import styles from 'styles/takgu/party/TemplateModal.module.scss';
function isUpdate(formData: PartyTemplateForm): formData is PartyGameTemplate {
return !!formData.gameTemplateId;
@@ -38,7 +38,6 @@ export default function TemplateModal({
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault();
- console.log(formData);
if (isUpdate(formData)) updateTemplate(formData);
else createTemplate(formData);
setModal({ modalName: null });
diff --git a/components/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantEditModal.tsx b/components/takgu/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantEditModal.tsx
similarity index 83%
rename from components/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantEditModal.tsx
rename to components/takgu/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantEditModal.tsx
index 997d9f384..f9a9a2f47 100644
--- a/components/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantEditModal.tsx
+++ b/components/takgu/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantEditModal.tsx
@@ -1,13 +1,13 @@
import { useState, useCallback, useEffect } from 'react';
import { useSetRecoilState } from 'recoil';
import { Button } from '@mui/material';
-import { ITournamentUser } from 'types/admin/adminTournamentTypes';
+import { ITournamentUser } from 'types/admin/takgu/adminTournamentTypes';
import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import AdminSearchBar from 'components/admin/common/AdminSearchBar';
-import useAdminTournamentParticipantEdit from 'hooks/admin/modal/useAdminTournamentParticipantEdit';
-import styles from 'styles/admin/modal/AdminTournamentParticipantEditModal.module.scss';
+import AdminSearchBar from 'components/admin/takgu/common/AdminSearchBar';
+import useAdminTournamentParticipantEdit from 'hooks/admin/takgu/modal/useAdminTournamentParticipantEdit';
+import styles from 'styles/admin/takgu/modal/AdminTournamentParticipantEditModal.module.scss';
import AdminTournamentParticipantList from './AdminTournamentParticipantList';
export default function AdminTournamentParticipantEditModal(props: {
diff --git a/components/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantList.tsx b/components/takgu/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantList.tsx
similarity index 94%
rename from components/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantList.tsx
rename to components/takgu/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantList.tsx
index 24bd95492..0d17f6ffc 100644
--- a/components/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantList.tsx
+++ b/components/takgu/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantList.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import { Button } from '@mui/material';
-import { ITournamentUser } from 'types/admin/adminTournamentTypes';
-import styles from 'styles/admin/modal/AdminTournamentParticipantEditModal.module.scss';
+import { ITournamentUser } from 'types/admin/takgu/adminTournamentTypes';
+import styles from 'styles/admin/takgu/modal/AdminTournamentParticipantEditModal.module.scss';
import AdminTournamentParticipantDeleteConfirmInput from './AdminTournemntParticipantDeleteConfirmInput';
interface AdminTournamentParticipantListProps {
diff --git a/components/modal/admin/AdminTournamentParticipantEditModal/AdminTournemntParticipantDeleteConfirmInput.tsx b/components/takgu/modal/admin/AdminTournamentParticipantEditModal/AdminTournemntParticipantDeleteConfirmInput.tsx
similarity index 100%
rename from components/modal/admin/AdminTournamentParticipantEditModal/AdminTournemntParticipantDeleteConfirmInput.tsx
rename to components/takgu/modal/admin/AdminTournamentParticipantEditModal/AdminTournemntParticipantDeleteConfirmInput.tsx
diff --git a/components/modal/admin/AdminUserCoinModal.tsx b/components/takgu/modal/admin/AdminUserCoinModal.tsx
similarity index 96%
rename from components/modal/admin/AdminUserCoinModal.tsx
rename to components/takgu/modal/admin/AdminUserCoinModal.tsx
index 03ed58552..90d9dc765 100644
--- a/components/modal/admin/AdminUserCoinModal.tsx
+++ b/components/takgu/modal/admin/AdminUserCoinModal.tsx
@@ -1,10 +1,10 @@
import { useEffect, useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { IUserCoin } from 'types/admin/adminUserTypes';
+import { IUserCoin } from 'types/admin/takgu/adminUserTypes';
import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/modal/AdminUserCoin.module.scss';
+import styles from 'styles/admin/takgu/modal/AdminUserCoin.module.scss';
export default function AdminUserCoinModal(props: { intraId: string }) {
const MAX_LENGTH = 30;
diff --git a/components/modal/admin/DeletePenaltyModal.tsx b/components/takgu/modal/admin/DeletePenaltyModal.tsx
similarity index 89%
rename from components/modal/admin/DeletePenaltyModal.tsx
rename to components/takgu/modal/admin/DeletePenaltyModal.tsx
index cfafabe45..2f851c598 100644
--- a/components/modal/admin/DeletePenaltyModal.tsx
+++ b/components/takgu/modal/admin/DeletePenaltyModal.tsx
@@ -1,8 +1,8 @@
import { useResetRecoilState } from 'recoil';
import { FiAlertTriangle } from 'react-icons/fi';
import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
-import styles from 'styles/admin/modal/DeletePenaltyModal.module.scss';
+import { modalState } from 'utils/recoil/takgu/modal';
+import styles from 'styles/admin/takgu/modal/DeletePenaltyModal.module.scss';
export default function DeletePenaltyModal({
intraId,
diff --git a/components/modal/admin/DetailModal.tsx b/components/takgu/modal/admin/DetailModal.tsx
similarity index 93%
rename from components/modal/admin/DetailModal.tsx
rename to components/takgu/modal/admin/DetailModal.tsx
index b54a9e31b..f74deade8 100644
--- a/components/modal/admin/DetailModal.tsx
+++ b/components/takgu/modal/admin/DetailModal.tsx
@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react';
-import styles from 'styles/admin/modal/FeedbackDetail.module.scss';
+import styles from 'styles/admin/takgu/modal/FeedbackDetail.module.scss';
export default function DetailModal({
detailTitle,
diff --git a/components/modal/admin/SeasonEdit.tsx b/components/takgu/modal/admin/SeasonEdit.tsx
similarity index 94%
rename from components/modal/admin/SeasonEdit.tsx
rename to components/takgu/modal/admin/SeasonEdit.tsx
index abf2e76e3..53b9f5f46 100644
--- a/components/modal/admin/SeasonEdit.tsx
+++ b/components/takgu/modal/admin/SeasonEdit.tsx
@@ -1,10 +1,10 @@
import React, { useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { ISeason, ISeasonEditInfo } from 'types/seasonTypes';
+import { ISeason, ISeasonEditInfo } from 'types/takgu/seasonTypes';
import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/modal/SeasonEdit.module.scss';
+import styles from 'styles/admin/takgu/modal/SeasonEdit.module.scss';
const AdminSeasonEdit = ({
seasonId,
diff --git a/components/modal/afterGame/AfterGameModal.tsx b/components/takgu/modal/afterGame/AfterGameModal.tsx
similarity index 67%
rename from components/modal/afterGame/AfterGameModal.tsx
rename to components/takgu/modal/afterGame/AfterGameModal.tsx
index 9ef43551a..6ad8fe118 100644
--- a/components/modal/afterGame/AfterGameModal.tsx
+++ b/components/takgu/modal/afterGame/AfterGameModal.tsx
@@ -1,7 +1,7 @@
-import NormalGame from 'components/modal/afterGame/NormalGame';
-import ScoreGame from 'components/modal/afterGame/ScoreGame';
-import useCurrentGame from 'hooks/modal/aftergame/useCurrentGame';
-import useSubmitModal from 'hooks/modal/aftergame/useSubmitModal';
+import NormalGame from 'components/takgu/modal/afterGame/NormalGame';
+import ScoreGame from 'components/takgu/modal/afterGame/ScoreGame';
+import useCurrentGame from 'hooks/takgu/modal/aftergame/useCurrentGame';
+import useSubmitModal from 'hooks/takgu/modal/aftergame/useSubmitModal';
export default function AfterGameModal() {
const { currentGame } = useCurrentGame();
diff --git a/components/modal/afterGame/Buttons.tsx b/components/takgu/modal/afterGame/Buttons.tsx
similarity index 95%
rename from components/modal/afterGame/Buttons.tsx
rename to components/takgu/modal/afterGame/Buttons.tsx
index ce0ac9640..5285c1216 100644
--- a/components/modal/afterGame/Buttons.tsx
+++ b/components/takgu/modal/afterGame/Buttons.tsx
@@ -1,7 +1,7 @@
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
+} from 'components/takgu/modal/ModalButton';
interface ButtonsProps {
onCheck: boolean;
diff --git a/components/modal/afterGame/CheckedScore.tsx b/components/takgu/modal/afterGame/CheckedScore.tsx
similarity index 70%
rename from components/modal/afterGame/CheckedScore.tsx
rename to components/takgu/modal/afterGame/CheckedScore.tsx
index b13a30a2d..c3c61b8b3 100644
--- a/components/modal/afterGame/CheckedScore.tsx
+++ b/components/takgu/modal/afterGame/CheckedScore.tsx
@@ -1,5 +1,5 @@
-import { TeamScore } from 'types/scoreTypes';
-import styles from 'styles/modal/afterGame/AfterGameModal.module.scss';
+import { TeamScore } from 'types/takgu/scoreTypes';
+import styles from 'styles/takgu/modal/afterGame/AfterGameModal.module.scss';
interface CheckedScoreProps {
result: TeamScore;
diff --git a/components/modal/afterGame/Guide.tsx b/components/takgu/modal/afterGame/Guide.tsx
similarity index 94%
rename from components/modal/afterGame/Guide.tsx
rename to components/takgu/modal/afterGame/Guide.tsx
index afb53f1ec..13e2e8bf3 100644
--- a/components/modal/afterGame/Guide.tsx
+++ b/components/takgu/modal/afterGame/Guide.tsx
@@ -1,5 +1,5 @@
import { BsCheckCircle } from 'react-icons/bs';
-import styles from 'styles/modal/afterGame/AfterGameModal.module.scss';
+import styles from 'styles/takgu/modal/afterGame/AfterGameModal.module.scss';
interface GuideProps {
condition: boolean;
diff --git a/components/modal/afterGame/InputScore.tsx b/components/takgu/modal/afterGame/InputScore.tsx
similarity index 90%
rename from components/modal/afterGame/InputScore.tsx
rename to components/takgu/modal/afterGame/InputScore.tsx
index b65e38cf0..a3be02c40 100644
--- a/components/modal/afterGame/InputScore.tsx
+++ b/components/takgu/modal/afterGame/InputScore.tsx
@@ -1,6 +1,6 @@
import { KeyboardEvent } from 'react';
-import { TeamScore } from 'types/scoreTypes';
-import styles from 'styles/modal/afterGame/AfterGameModal.module.scss';
+import { TeamScore } from 'types/takgu/scoreTypes';
+import styles from 'styles/takgu/modal/afterGame/AfterGameModal.module.scss';
interface InputScoreProps {
result: TeamScore;
diff --git a/components/modal/afterGame/MatchTeams.tsx b/components/takgu/modal/afterGame/MatchTeams.tsx
similarity index 80%
rename from components/modal/afterGame/MatchTeams.tsx
rename to components/takgu/modal/afterGame/MatchTeams.tsx
index 0152adfd5..db3e1dfa7 100644
--- a/components/modal/afterGame/MatchTeams.tsx
+++ b/components/takgu/modal/afterGame/MatchTeams.tsx
@@ -1,6 +1,6 @@
-import { Player, Players } from 'types/scoreTypes';
-import PlayerImage from 'components/PlayerImage';
-import styles from 'styles/modal/afterGame/AfterGameModal.module.scss';
+import { Player, Players } from 'types/takgu/scoreTypes';
+import PlayerImage from 'components/takgu/PlayerImage';
+import styles from 'styles/takgu/modal/afterGame/AfterGameModal.module.scss';
export function MatchTeams({ matchTeams }: { matchTeams: Players }) {
return (
diff --git a/components/modal/afterGame/NormalGame.tsx b/components/takgu/modal/afterGame/NormalGame.tsx
similarity index 76%
rename from components/modal/afterGame/NormalGame.tsx
rename to components/takgu/modal/afterGame/NormalGame.tsx
index e8883abaa..760c7ea0d 100644
--- a/components/modal/afterGame/NormalGame.tsx
+++ b/components/takgu/modal/afterGame/NormalGame.tsx
@@ -1,12 +1,12 @@
import { useState } from 'react';
-import { AfterGame } from 'types/scoreTypes';
-import Guide from 'components/modal/afterGame/Guide';
-import { MatchTeams } from 'components/modal/afterGame/MatchTeams';
+import { AfterGame } from 'types/takgu/scoreTypes';
+import Guide from 'components/takgu/modal/afterGame/Guide';
+import { MatchTeams } from 'components/takgu/modal/afterGame/MatchTeams';
import {
ModalButton,
ModalButtonContainer,
-} from 'components/modal/ModalButton';
-import styles from 'styles/modal/afterGame/AfterGameModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import styles from 'styles/takgu/modal/afterGame/AfterGameModal.module.scss';
interface NormalGameProps {
currentGame: AfterGame;
diff --git a/components/modal/afterGame/Score.tsx b/components/takgu/modal/afterGame/Score.tsx
similarity index 66%
rename from components/modal/afterGame/Score.tsx
rename to components/takgu/modal/afterGame/Score.tsx
index 7a724e800..67000acc1 100644
--- a/components/modal/afterGame/Score.tsx
+++ b/components/takgu/modal/afterGame/Score.tsx
@@ -1,6 +1,6 @@
-import { TeamScore } from 'types/scoreTypes';
-import CheckedScore from 'components/modal/afterGame/CheckedScore';
-import InputScore from 'components/modal/afterGame/InputScore';
+import { TeamScore } from 'types/takgu/scoreTypes';
+import CheckedScore from 'components/takgu/modal/afterGame/CheckedScore';
+import InputScore from 'components/takgu/modal/afterGame/InputScore';
interface ScoreProps {
result: TeamScore;
diff --git a/components/modal/afterGame/ScoreGame.tsx b/components/takgu/modal/afterGame/ScoreGame.tsx
similarity index 76%
rename from components/modal/afterGame/ScoreGame.tsx
rename to components/takgu/modal/afterGame/ScoreGame.tsx
index 609c408d0..996316ef7 100644
--- a/components/modal/afterGame/ScoreGame.tsx
+++ b/components/takgu/modal/afterGame/ScoreGame.tsx
@@ -1,15 +1,15 @@
import { useState } from 'react';
-import { AfterGame, TeamScore } from 'types/scoreTypes';
-import { Buttons } from 'components/modal/afterGame/Buttons';
-import Guide from 'components/modal/afterGame/Guide';
-import { MatchTeams } from 'components/modal/afterGame/MatchTeams';
-import Score from 'components/modal/afterGame/Score';
+import { AfterGame, TeamScore } from 'types/takgu/scoreTypes';
+import { Buttons } from 'components/takgu/modal/afterGame/Buttons';
+import Guide from 'components/takgu/modal/afterGame/Guide';
+import { MatchTeams } from 'components/takgu/modal/afterGame/MatchTeams';
+import Score from 'components/takgu/modal/afterGame/Score';
import {
ModalButton,
ModalButtonContainer,
-} from 'components/modal/ModalButton';
-import useScoreGame from 'hooks/modal/aftergame/useScoreGame';
-import styles from 'styles/modal/afterGame/AfterGameModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import useScoreGame from 'hooks/takgu/modal/aftergame/useScoreGame';
+import styles from 'styles/takgu/modal/afterGame/AfterGameModal.module.scss';
interface ScoreGameProps {
currentGame: AfterGame;
diff --git a/components/modal/event/AnnouncementModal.tsx b/components/takgu/modal/event/AnnouncementModal.tsx
similarity index 86%
rename from components/modal/event/AnnouncementModal.tsx
rename to components/takgu/modal/event/AnnouncementModal.tsx
index 14d89295a..e3a41af7f 100644
--- a/components/modal/event/AnnouncementModal.tsx
+++ b/components/takgu/modal/event/AnnouncementModal.tsx
@@ -1,15 +1,15 @@
import { useState, useEffect } from 'react';
import { useSetRecoilState } from 'recoil';
-import { Announcement } from 'types/modalTypes';
-import { QUILL_FORMATS } from 'types/quillTypes';
-import { modalState } from 'utils/recoil/modal';
+import { Announcement } from 'types/takgu/modalTypes';
+import { QUILL_FORMATS } from 'types/takgu/quillTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
import DynamicQuill from 'components/DynamicQuill';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import { useUser } from 'hooks/Layout/useUser';
-import styles from 'styles/modal/event/AnnouncementModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import { useUser } from 'hooks/takgu/Layout/useUser';
+import styles from 'styles/takgu/modal/event/AnnouncementModal.module.scss';
import 'react-quill/dist/quill.bubble.css';
type AnnouncementModalProps = {
diff --git a/components/modal/event/WelcomeModal.tsx b/components/takgu/modal/event/WelcomeModal.tsx
similarity index 91%
rename from components/modal/event/WelcomeModal.tsx
rename to components/takgu/modal/event/WelcomeModal.tsx
index 0e160d189..8f7ff6e77 100644
--- a/components/modal/event/WelcomeModal.tsx
+++ b/components/takgu/modal/event/WelcomeModal.tsx
@@ -1,16 +1,16 @@
import { useState } from 'react';
import { useQueryClient } from 'react-query';
import { useSetRecoilState } from 'recoil';
-import { Modal } from 'types/modalTypes';
+import { Modal } from 'types/takgu/modalTypes';
import { instance } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
-import CoinPopcon from 'components/modal/CoinPopcon';
+import { modalState } from 'utils/recoil/takgu/modal';
+import CoinPopcon from 'components/takgu/modal/CoinPopcon';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import styles from 'styles/modal/event/WelcomeModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import styles from 'styles/takgu/modal/event/WelcomeModal.module.scss';
export default function WelcomeModal() {
const setModal = useSetRecoilState(modalState);
diff --git a/components/modal/match/MatchCancelModal.tsx b/components/takgu/modal/match/MatchCancelModal.tsx
similarity index 84%
rename from components/modal/match/MatchCancelModal.tsx
rename to components/takgu/modal/match/MatchCancelModal.tsx
index 23b0c3d85..acf8a668c 100644
--- a/components/modal/match/MatchCancelModal.tsx
+++ b/components/takgu/modal/match/MatchCancelModal.tsx
@@ -1,11 +1,11 @@
import { useState } from 'react';
-import { Cancel } from 'types/modalTypes';
+import { Cancel } from 'types/takgu/modalTypes';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import useMatchCancelModal from 'hooks/modal/match/useMatchCancelModal';
-import styles from 'styles/modal/match/MatchCancelModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import useMatchCancelModal from 'hooks/takgu/modal/match/useMatchCancelModal';
+import styles from 'styles/takgu/modal/match/MatchCancelModal.module.scss';
export default function MatchCancelModal({ startTime }: Cancel) {
const [isLoading, setIsLoading] = useState(false);
diff --git a/components/modal/match/MatchEnrollModal.tsx b/components/takgu/modal/match/MatchEnrollModal.tsx
similarity index 84%
rename from components/modal/match/MatchEnrollModal.tsx
rename to components/takgu/modal/match/MatchEnrollModal.tsx
index 97862ee17..d4c012620 100644
--- a/components/modal/match/MatchEnrollModal.tsx
+++ b/components/takgu/modal/match/MatchEnrollModal.tsx
@@ -1,12 +1,12 @@
import { useState } from 'react';
-import { Enroll } from 'types/modalTypes';
+import { Enroll } from 'types/takgu/modalTypes';
import { gameTimeToString } from 'utils/handleTime';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import useMatchEnrollModal from 'hooks/modal/match/useMatchEnrollModal';
-import styles from 'styles/modal/match/MatchEnrollModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import useMatchEnrollModal from 'hooks/takgu/modal/match/useMatchEnrollModal';
+import styles from 'styles/takgu/modal/match/MatchEnrollModal.module.scss';
export default function MatchEnrollModal({ startTime, endTime, mode }: Enroll) {
const [isLoading, setIsLoading] = useState(false);
diff --git a/components/modal/match/MatchManualModal.tsx b/components/takgu/modal/match/MatchManualModal.tsx
similarity index 94%
rename from components/modal/match/MatchManualModal.tsx
rename to components/takgu/modal/match/MatchManualModal.tsx
index 84f7b77b7..e078aceaa 100644
--- a/components/modal/match/MatchManualModal.tsx
+++ b/components/takgu/modal/match/MatchManualModal.tsx
@@ -1,14 +1,14 @@
import { useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { MatchMode } from 'types/mainType';
-import { Manual } from 'types/modalTypes';
-import { modalState } from 'utils/recoil/modal';
+import { MatchMode } from 'types/takgu/mainType';
+import { Manual } from 'types/takgu/modalTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import ModeRadiobox from 'components/mode/modeItems/ModeRadiobox';
-import styles from 'styles/modal/match/MatchManualModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import ModeRadiobox from 'components/takgu/mode/modeItems/ModeRadiobox';
+import styles from 'styles/takgu/modal/match/MatchManualModal.module.scss';
type contentType = {
title: React.ReactNode;
@@ -200,7 +200,7 @@ function ContentTitle({ title, icon }: contentTitleProps) {
icon = typeof icon === 'string' ? {icon} : icon;
return (
{icon ? icon : null}
diff --git a/components/modal/match/MatchRejectModal.tsx b/components/takgu/modal/match/MatchRejectModal.tsx
similarity index 80%
rename from components/modal/match/MatchRejectModal.tsx
rename to components/takgu/modal/match/MatchRejectModal.tsx
index cd4524fd7..136add079 100644
--- a/components/modal/match/MatchRejectModal.tsx
+++ b/components/takgu/modal/match/MatchRejectModal.tsx
@@ -1,11 +1,11 @@
import { useSetRecoilState } from 'recoil';
-import { reloadMatchState } from 'utils/recoil/match';
-import { modalState } from 'utils/recoil/modal';
+import { reloadMatchState } from 'utils/recoil/takgu/match';
+import { modalState } from 'utils/recoil/takgu/modal';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import styles from 'styles/modal/match/MatchRejectModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import styles from 'styles/takgu/modal/match/MatchRejectModal.module.scss';
export default function MatchRejectModal() {
const setModal = useSetRecoilState(modalState);
diff --git a/components/modal/menu/LogoutModal.tsx b/components/takgu/modal/menu/LogoutModal.tsx
similarity index 90%
rename from components/modal/menu/LogoutModal.tsx
rename to components/takgu/modal/menu/LogoutModal.tsx
index 95f9d81d3..395b95923 100644
--- a/components/modal/menu/LogoutModal.tsx
+++ b/components/takgu/modal/menu/LogoutModal.tsx
@@ -3,9 +3,9 @@ import { useQueryClient } from 'react-query';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
+} from 'components/takgu/modal/ModalButton';
import useLogoutCheck from 'hooks/Login/useLogoutCheck';
-import styles from 'styles/modal/menu/LogoutModal.module.scss';
+import styles from 'styles/takgu/modal/menu/LogoutModal.module.scss';
export default function LogoutModal() {
const [isLoading, setIsLoading] = useState(false);
diff --git a/components/modal/menu/ReportModal.tsx b/components/takgu/modal/menu/ReportModal.tsx
similarity index 91%
rename from components/modal/menu/ReportModal.tsx
rename to components/takgu/modal/menu/ReportModal.tsx
index 51daf7ec4..ef8cdf67d 100644
--- a/components/modal/menu/ReportModal.tsx
+++ b/components/takgu/modal/menu/ReportModal.tsx
@@ -1,12 +1,12 @@
import { useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import useReportHandler from 'hooks/modal/useReportHandler';
-import styles from 'styles/modal/menu/ReportModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import useReportHandler from 'hooks/takgu/modal/useReportHandler';
+import styles from 'styles/takgu/modal/menu/ReportModal.module.scss';
interface Report {
category: string;
diff --git a/components/modal/modalType/AdminModal.tsx b/components/takgu/modal/modalType/AdminModal.tsx
similarity index 63%
rename from components/modal/modalType/AdminModal.tsx
rename to components/takgu/modal/modalType/AdminModal.tsx
index 5b53d8050..b88a58ed8 100644
--- a/components/modal/modalType/AdminModal.tsx
+++ b/components/takgu/modal/modalType/AdminModal.tsx
@@ -1,24 +1,24 @@
import { useRecoilValue } from 'recoil';
-import { modalState } from 'utils/recoil/modal';
-import AdminCheckSendNotiModal from 'components/modal/admin/AdminCheckSendNoti';
-import AdminDeleteItemModal from 'components/modal/admin/AdminDeleteItem';
-import AdminDeleteMegaphoneModal from 'components/modal/admin/AdminDeleteMegaphoneModal';
-import AdminDeleteProfileModal from 'components/modal/admin/AdminDeleteProfileModal';
-import AdminEditCoinPolicyModal from 'components/modal/admin/AdminEditCoinPolicy';
-import AdminEditItemModal from 'components/modal/admin/AdminEditItem';
-import AdminEditTournamentBraket from 'components/modal/admin/AdminEditTournamentBraket';
-import AdminFeedbackCheck from 'components/modal/admin/AdminFeedbackCheckModal';
-import AdminModifyScoreModal from 'components/modal/admin/AdminModifyScoreModal';
-import AdminNotiUserModal from 'components/modal/admin/AdminNotiUserModal';
-import AdminPartyPenaltyModal from 'components/modal/admin/AdminPartyPenaltyModal';
-import AdminPenaltyModal from 'components/modal/admin/AdminPenaltyModal';
-import AdminProfileModal from 'components/modal/admin/AdminProfileModal';
-import AdminRecruitMessageTemplateModal from 'components/modal/admin/AdminRecruitMessageTemplateModal';
-import AdminTournamentParticipantEditModal from 'components/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantEditModal';
-import AdminUserCoinModal from 'components/modal/admin/AdminUserCoinModal';
-import DeletePenaltyModal from 'components/modal/admin/DeletePenaltyModal';
-import DetailModal from 'components/modal/admin/DetailModal';
-import AdminSeasonEdit from 'components/modal/admin/SeasonEdit';
+import { modalState } from 'utils/recoil/takgu/modal';
+import AdminCheckSendNotiModal from 'components/takgu/modal/admin/AdminCheckSendNoti';
+import AdminDeleteItemModal from 'components/takgu/modal/admin/AdminDeleteItem';
+import AdminDeleteMegaphoneModal from 'components/takgu/modal/admin/AdminDeleteMegaphoneModal';
+import AdminDeleteProfileModal from 'components/takgu/modal/admin/AdminDeleteProfileModal';
+import AdminEditCoinPolicyModal from 'components/takgu/modal/admin/AdminEditCoinPolicy';
+import AdminEditItemModal from 'components/takgu/modal/admin/AdminEditItem';
+import AdminEditTournamentBraket from 'components/takgu/modal/admin/AdminEditTournamentBraket';
+import AdminFeedbackCheck from 'components/takgu/modal/admin/AdminFeedbackCheckModal';
+import AdminModifyScoreModal from 'components/takgu/modal/admin/AdminModifyScoreModal';
+import AdminNotiUserModal from 'components/takgu/modal/admin/AdminNotiUserModal';
+import AdminPartyPenaltyModal from 'components/takgu/modal/admin/AdminPartyPenaltyModal';
+import AdminPenaltyModal from 'components/takgu/modal/admin/AdminPenaltyModal';
+import AdminProfileModal from 'components/takgu/modal/admin/AdminProfileModal';
+import AdminRecruitMessageTemplateModal from 'components/takgu/modal/admin/AdminRecruitMessageTemplateModal';
+import AdminTournamentParticipantEditModal from 'components/takgu/modal/admin/AdminTournamentParticipantEditModal/AdminTournamentParticipantEditModal';
+import AdminUserCoinModal from 'components/takgu/modal/admin/AdminUserCoinModal';
+import DeletePenaltyModal from 'components/takgu/modal/admin/DeletePenaltyModal';
+import DetailModal from 'components/takgu/modal/admin/DetailModal';
+import AdminSeasonEdit from 'components/takgu/modal/admin/SeasonEdit';
import AdminRecruitResultModal from '../admin/AdminRecruitResultModal';
import TemplateModal from '../admin/AdminTemplateModal';
import PartyRoomEditModal from '../party/PartyRoomEditModal';
diff --git a/components/modal/modalType/NormalModal.tsx b/components/takgu/modal/modalType/NormalModal.tsx
similarity index 50%
rename from components/modal/modalType/NormalModal.tsx
rename to components/takgu/modal/modalType/NormalModal.tsx
index ea91cd7e1..87b1bce48 100644
--- a/components/modal/modalType/NormalModal.tsx
+++ b/components/takgu/modal/modalType/NormalModal.tsx
@@ -1,17 +1,17 @@
import { useRecoilValue } from 'recoil';
-import { modalState } from 'utils/recoil/modal';
-import AfterGameModal from 'components/modal/afterGame/AfterGameModal';
-import AnnouncementModal from 'components/modal/event/AnnouncementModal';
-import WelcomeModal from 'components/modal/event/WelcomeModal';
-import MatchCancelModal from 'components/modal/match/MatchCancelModal';
-import MatchEnrollModal from 'components/modal/match/MatchEnrollModal';
-import MatchManualModal from 'components/modal/match/MatchManualModal';
-import MatchRejectModal from 'components/modal/match/MatchRejectModal';
-import LogoutModal from 'components/modal/menu/LogoutModal';
-import ReportModal from 'components/modal/menu/ReportModal';
-import EditProfileModal from 'components/modal/profile/EditProfileModal';
-import KakaoEditModal from 'components/modal/profile/KakaoEditModal';
-import StatChangeModal from 'components/modal/statChange/StatChangeModal';
+import { modalState } from 'utils/recoil/takgu/modal';
+import AfterGameModal from 'components/takgu/modal/afterGame/AfterGameModal';
+import AnnouncementModal from 'components/takgu/modal/event/AnnouncementModal';
+import WelcomeModal from 'components/takgu/modal/event/WelcomeModal';
+import MatchCancelModal from 'components/takgu/modal/match/MatchCancelModal';
+import MatchEnrollModal from 'components/takgu/modal/match/MatchEnrollModal';
+import MatchManualModal from 'components/takgu/modal/match/MatchManualModal';
+import MatchRejectModal from 'components/takgu/modal/match/MatchRejectModal';
+import LogoutModal from 'components/takgu/modal/menu/LogoutModal';
+import ReportModal from 'components/takgu/modal/menu/ReportModal';
+import EditProfileModal from 'components/takgu/modal/profile/EditProfileModal';
+import KakaoEditModal from 'components/takgu/modal/profile/KakaoEditModal';
+import StatChangeModal from 'components/takgu/modal/statChange/StatChangeModal';
export default function NormalModal() {
const { modalName, announcement, isAttended, enroll, cancel, manual, exp } =
diff --git a/components/modal/modalType/PartyModal.tsx b/components/takgu/modal/modalType/PartyModal.tsx
similarity index 90%
rename from components/modal/modalType/PartyModal.tsx
rename to components/takgu/modal/modalType/PartyModal.tsx
index 0fb383ee0..c31714e3f 100644
--- a/components/modal/modalType/PartyModal.tsx
+++ b/components/takgu/modal/modalType/PartyModal.tsx
@@ -1,5 +1,5 @@
import { useRecoilValue } from 'recoil';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import PartyManudalModal from '../party/PartyManualModal';
import { PartyReportModal } from '../party/PartyReportModal';
diff --git a/components/modal/modalType/StoreModal.tsx b/components/takgu/modal/modalType/StoreModal.tsx
similarity index 56%
rename from components/modal/modalType/StoreModal.tsx
rename to components/takgu/modal/modalType/StoreModal.tsx
index 921fd7be2..b1c044624 100644
--- a/components/modal/modalType/StoreModal.tsx
+++ b/components/takgu/modal/modalType/StoreModal.tsx
@@ -1,18 +1,18 @@
import { useRecoilValue } from 'recoil';
-import { modalState } from 'utils/recoil/modal';
-import CoinChangeModal from 'components/modal/statChange/CoinChangeModal';
-import ChangeIdColorModal from 'components/modal/store/inventory/ChangeIdColorModal';
-import ChangeProfileBackgroundModal from 'components/modal/store/inventory/ChangeProfileBackgroundModal';
-import ChangeProfileEdgeModal from 'components/modal/store/inventory/ChangeProfileEdgeModal';
-import EditMegaphoneModal from 'components/modal/store/inventory/EditMegaphoneModal';
-import GachaModal from 'components/modal/store/inventory/GachaModal';
-import NewMegaphoneModal from 'components/modal/store/inventory/NewMegaphoneModal';
-import ProfileImageModal from 'components/modal/store/inventory/ProfileImageModal';
-import BuyModal from 'components/modal/store/purchase/BuyModal';
-import GiftModal from 'components/modal/store/purchase/GiftModal';
-import NoCoinModal from 'components/modal/store/purchase/NoCoinModal';
-import StoreManualModal from 'components/modal/store/StoreManualModal';
-import UserCoinHistoryModal from 'components/modal/store/UserCoinHistoryModal';
+import { modalState } from 'utils/recoil/takgu/modal';
+import CoinChangeModal from 'components/takgu/modal/statChange/CoinChangeModal';
+import ChangeIdColorModal from 'components/takgu/modal/store/inventory/ChangeIdColorModal';
+import ChangeProfileBackgroundModal from 'components/takgu/modal/store/inventory/ChangeProfileBackgroundModal';
+import ChangeProfileEdgeModal from 'components/takgu/modal/store/inventory/ChangeProfileEdgeModal';
+import EditMegaphoneModal from 'components/takgu/modal/store/inventory/EditMegaphoneModal';
+import GachaModal from 'components/takgu/modal/store/inventory/GachaModal';
+import NewMegaphoneModal from 'components/takgu/modal/store/inventory/NewMegaphoneModal';
+import ProfileImageModal from 'components/takgu/modal/store/inventory/ProfileImageModal';
+import BuyModal from 'components/takgu/modal/store/purchase/BuyModal';
+import GiftModal from 'components/takgu/modal/store/purchase/GiftModal';
+import NoCoinModal from 'components/takgu/modal/store/purchase/NoCoinModal';
+import StoreManualModal from 'components/takgu/modal/store/StoreManualModal';
+import UserCoinHistoryModal from 'components/takgu/modal/store/UserCoinHistoryModal';
export default function StoreModal() {
const {
diff --git a/components/modal/modalType/TournamentModal.tsx b/components/takgu/modal/modalType/TournamentModal.tsx
similarity index 91%
rename from components/modal/modalType/TournamentModal.tsx
rename to components/takgu/modal/modalType/TournamentModal.tsx
index 3dd47174b..9fa2faf89 100644
--- a/components/modal/modalType/TournamentModal.tsx
+++ b/components/takgu/modal/modalType/TournamentModal.tsx
@@ -1,5 +1,5 @@
import { useRecoilValue } from 'recoil';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import TournamentManualModal from '../tournament/TournamentManualModal';
import TournamentRegistryModal from '../tournament/TournamentRegistryModal';
diff --git a/components/modal/party/PartyManualModal.tsx b/components/takgu/modal/party/PartyManualModal.tsx
similarity index 94%
rename from components/modal/party/PartyManualModal.tsx
rename to components/takgu/modal/party/PartyManualModal.tsx
index 86854a12f..47611d194 100644
--- a/components/modal/party/PartyManualModal.tsx
+++ b/components/takgu/modal/party/PartyManualModal.tsx
@@ -1,6 +1,6 @@
import { useSetRecoilState } from 'recoil';
-import { modalState } from 'utils/recoil/modal';
-import styles from 'styles/modal/party/PartyManualModal.module.scss';
+import { modalState } from 'utils/recoil/takgu/modal';
+import styles from 'styles/takgu/modal/party/PartyManualModal.module.scss';
type contentType = {
title: React.ReactNode;
@@ -83,7 +83,7 @@ function ContentTitle({ title, icon }: contentTitleProps) {
icon = typeof icon === 'string' ? {icon} : icon;
return (
{icon ? icon : null}
diff --git a/components/modal/party/PartyReportModal.tsx b/components/takgu/modal/party/PartyReportModal.tsx
similarity index 94%
rename from components/modal/party/PartyReportModal.tsx
rename to components/takgu/modal/party/PartyReportModal.tsx
index 7cbb04605..7a094b613 100644
--- a/components/modal/party/PartyReportModal.tsx
+++ b/components/takgu/modal/party/PartyReportModal.tsx
@@ -1,11 +1,11 @@
import { AxiosError } from 'axios';
import { useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { Modal, PartyReportModalData } from 'types/modalTypes';
+import { Modal, PartyReportModalData } from 'types/takgu/modalTypes';
import { instance } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/modal/menu/ReportModal.module.scss';
+import styles from 'styles/takgu/modal/menu/ReportModal.module.scss';
import { ModalButton, ModalButtonContainer } from '../ModalButton';
export function PartyReportModal({ report }: { report: PartyReportModalData }) {
diff --git a/components/modal/party/PartyRoomEditModal.tsx b/components/takgu/modal/party/PartyRoomEditModal.tsx
similarity index 94%
rename from components/modal/party/PartyRoomEditModal.tsx
rename to components/takgu/modal/party/PartyRoomEditModal.tsx
index cf5b3d15f..f025f355b 100644
--- a/components/modal/party/PartyRoomEditModal.tsx
+++ b/components/takgu/modal/party/PartyRoomEditModal.tsx
@@ -7,11 +7,11 @@ import {
PartyRoomDetail,
PartyRoomStatus,
roomStatusOpts,
-} from 'types/partyTypes';
+} from 'types/takgu/partyTypes';
import { instanceInPartyManage } from 'utils/axios';
import { dateToStringShort } from 'utils/handleTime';
import { toastState } from 'utils/recoil/toast';
-import styles from 'styles/admin/party/PartyRoomEdit.module.scss';
+import styles from 'styles/admin/takgu/party/PartyRoomEdit.module.scss';
export default function PartyRoomEditModal({ roomId }: { roomId: number }) {
const setSnackBar = useSetRecoilState(toastState);
diff --git a/components/modal/profile/EditProfileModal.tsx b/components/takgu/modal/profile/EditProfileModal.tsx
similarity index 93%
rename from components/modal/profile/EditProfileModal.tsx
rename to components/takgu/modal/profile/EditProfileModal.tsx
index f5addcadd..5de1dcb1c 100644
--- a/components/modal/profile/EditProfileModal.tsx
+++ b/components/takgu/modal/profile/EditProfileModal.tsx
@@ -1,13 +1,13 @@
import { useEffect, useState } from 'react';
import { useRecoilState } from 'recoil';
-import { ProfileBasic, racketTypes } from 'types/userTypes';
-import { profileState } from 'utils/recoil/user';
+import { ProfileBasic, racketTypes } from 'types/takgu/userTypes';
+import { profileState } from 'utils/recoil/takgu/user';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import useEditProfileModal from 'hooks/modal/useEditProfileModal';
-import styles from 'styles/user/Profile.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import useEditProfileModal from 'hooks/takgu/modal/useEditProfileModal';
+import styles from 'styles/takgu/user/Profile.module.scss';
export interface EditedProfile {
racketType: string;
diff --git a/components/modal/profile/KakaoEditModal.tsx b/components/takgu/modal/profile/KakaoEditModal.tsx
similarity index 96%
rename from components/modal/profile/KakaoEditModal.tsx
rename to components/takgu/modal/profile/KakaoEditModal.tsx
index e404d80e8..008f3bb4b 100644
--- a/components/modal/profile/KakaoEditModal.tsx
+++ b/components/takgu/modal/profile/KakaoEditModal.tsx
@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
import { useSetRecoilState } from 'recoil';
import { instance } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import styles from 'styles/modal/menu/KakaoEditModal.module.scss';
+import styles from 'styles/takgu/modal/menu/KakaoEditModal.module.scss';
type UserType = 'kakao' | 'fortyTwo' | 'both' | '';
diff --git a/components/modal/recruitment/ApplyEditModal.tsx b/components/takgu/modal/recruitment/ApplyEditModal.tsx
similarity index 89%
rename from components/modal/recruitment/ApplyEditModal.tsx
rename to components/takgu/modal/recruitment/ApplyEditModal.tsx
index ea5f691e6..92b470e8f 100644
--- a/components/modal/recruitment/ApplyEditModal.tsx
+++ b/components/takgu/modal/recruitment/ApplyEditModal.tsx
@@ -1,13 +1,13 @@
import { useRouter } from 'next/router';
import { useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil';
import { Box, Button, Modal, Typography } from '@mui/material';
-import { ApplicationFormType } from 'types/recruit/recruitments';
+import { ApplicationFormType } from 'types/takgu/recruit/recruitments';
import {
applicationAlertState,
applicationModalState,
} from 'utils/recoil/application';
-import useUserApplicationForm from 'hooks/recruit/useUserApplicationForm';
-import styles from 'styles/modal/recruit/recruitModal.module.scss';
+import useUserApplicationForm from 'hooks/takgu/recruit/useUserApplicationForm';
+import styles from 'styles/takgu/modal/recruit/recruitModal.module.scss';
interface IApplyEditModalProps {
recruitId: number;
@@ -40,7 +40,7 @@ function ApplyEditModal(props: IApplyEditModalProps) {
severity: mode === 'APPLY' ? 'success' : 'info',
});
resetModalState();
- router.push(`/recruit/detail?recruitId=${recruitId}`);
+ router.push(`/takgu/recruit/detail?recruitId=${recruitId}`);
},
onError: () =>
setAlertState({
diff --git a/components/modal/recruitment/CancelModal.tsx b/components/takgu/modal/recruitment/CancelModal.tsx
similarity index 94%
rename from components/modal/recruitment/CancelModal.tsx
rename to components/takgu/modal/recruitment/CancelModal.tsx
index 85dbff34c..5f88f2fb4 100644
--- a/components/modal/recruitment/CancelModal.tsx
+++ b/components/takgu/modal/recruitment/CancelModal.tsx
@@ -8,7 +8,7 @@ import {
applicationAlertState,
applicationModalState,
} from 'utils/recoil/application';
-import styles from 'styles/modal/recruit/recruitModal.module.scss';
+import styles from 'styles/takgu/modal/recruit/recruitModal.module.scss';
interface ICancelModalProps {
recruitId: number;
@@ -39,7 +39,7 @@ function CancelModal(props: ICancelModalProps) {
severity: 'success',
});
resetModalState();
- router.push(`/recruit/detail?recruitId=${recruitId}`);
+ router.push(`/takgu/recruit/detail?recruitId=${recruitId}`);
},
onError: () => {
setAlertState({
diff --git a/components/modal/statChange/Celebration.tsx b/components/takgu/modal/statChange/Celebration.tsx
similarity index 94%
rename from components/modal/statChange/Celebration.tsx
rename to components/takgu/modal/statChange/Celebration.tsx
index 617abf2e8..b312043dc 100644
--- a/components/modal/statChange/Celebration.tsx
+++ b/components/takgu/modal/statChange/Celebration.tsx
@@ -1,5 +1,5 @@
import { useEffect } from 'react';
-import styles from 'styles/modal/afterGame/StatChangeModal.module.scss';
+import styles from 'styles/takgu/modal/afterGame/StatChangeModal.module.scss';
export default function Celebration() {
useEffect(() => {
diff --git a/components/modal/statChange/CoinChangeModal.tsx b/components/takgu/modal/statChange/CoinChangeModal.tsx
similarity index 72%
rename from components/modal/statChange/CoinChangeModal.tsx
rename to components/takgu/modal/statChange/CoinChangeModal.tsx
index 62d974b74..db91ffbc0 100644
--- a/components/modal/statChange/CoinChangeModal.tsx
+++ b/components/takgu/modal/statChange/CoinChangeModal.tsx
@@ -2,12 +2,12 @@ import Image from 'next/image';
import { useEffect } from 'react';
import { useQueryClient } from 'react-query';
import { useSetRecoilState } from 'recoil';
-import { CoinResult } from 'types/coinTypes';
-import { modalState } from 'utils/recoil/modal';
-import CoinAnimation from 'components/modal/CoinAnimation';
-import CoinPopcon from 'components/modal/CoinPopcon';
-import CoinStat from 'components/modal/statChange/CoinStatChange';
-import styles from 'styles/modal/CoinChangeModal.module.scss';
+import { CoinResult } from 'types/takgu/coinTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
+import CoinAnimation from 'components/takgu/modal/CoinAnimation';
+import CoinPopcon from 'components/takgu/modal/CoinPopcon';
+import CoinStat from 'components/takgu/modal/statChange/CoinStatChange';
+import styles from 'styles/takgu/modal/CoinChangeModal.module.scss';
export default function CoinChangeModal(coin: CoinResult) {
const setModal = useSetRecoilState(modalState);
@@ -40,7 +40,12 @@ export default function CoinChangeModal(coin: CoinResult) {
-
{icon ? icon : null}
diff --git a/components/modal/store/UserCoinHistoryModal.tsx b/components/takgu/modal/store/UserCoinHistoryModal.tsx
similarity index 85%
rename from components/modal/store/UserCoinHistoryModal.tsx
rename to components/takgu/modal/store/UserCoinHistoryModal.tsx
index 441d3ae42..3b8e61af5 100644
--- a/components/modal/store/UserCoinHistoryModal.tsx
+++ b/components/takgu/modal/store/UserCoinHistoryModal.tsx
@@ -1,17 +1,17 @@
import { useEffect, useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { ICoin, ICoinHistoryTable } from 'types/userTypes';
+import { ICoin, ICoinHistoryTable } from 'types/takgu/userTypes';
import { instance } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
+import PageNation from 'components/Pagination';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import CoinHistoryContainer from 'components/modal/store/CoinHistoryContainer';
-import PageNation from 'components/Pagination';
-import CoinImage from 'components/store/CoinImage';
-import styles from 'styles/modal/store/UserCoinHistoryModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import CoinHistoryContainer from 'components/takgu/modal/store/CoinHistoryContainer';
+import CoinImage from 'components/takgu/store/CoinImage';
+import styles from 'styles/takgu/modal/store/UserCoinHistoryModal.module.scss';
export default function UserCoinHistoryModal({ coin }: ICoin) {
const setModal = useSetRecoilState(modalState);
diff --git a/components/modal/store/inventory/BackgroundPreview.tsx b/components/takgu/modal/store/inventory/BackgroundPreview.tsx
similarity index 85%
rename from components/modal/store/inventory/BackgroundPreview.tsx
rename to components/takgu/modal/store/inventory/BackgroundPreview.tsx
index 15c3b43fe..e48081a15 100644
--- a/components/modal/store/inventory/BackgroundPreview.tsx
+++ b/components/takgu/modal/store/inventory/BackgroundPreview.tsx
@@ -1,5 +1,5 @@
-import { RandomColors, BackgroundColors } from 'types/colorModeTypes';
-import styles from 'styles/modal/store/BackgroundPreview.module.scss';
+import { RandomColors, BackgroundColors } from 'types/takgu/colorModeTypes';
+import styles from 'styles/takgu/modal/store/BackgroundPreview.module.scss';
export default function BackgroundPreview({
background,
diff --git a/components/modal/store/inventory/ChangeIdColorModal.tsx b/components/takgu/modal/store/inventory/ChangeIdColorModal.tsx
similarity index 85%
rename from components/modal/store/inventory/ChangeIdColorModal.tsx
rename to components/takgu/modal/store/inventory/ChangeIdColorModal.tsx
index ce3dec4e7..8b593f099 100644
--- a/components/modal/store/inventory/ChangeIdColorModal.tsx
+++ b/components/takgu/modal/store/inventory/ChangeIdColorModal.tsx
@@ -1,20 +1,20 @@
import { useCallback, useState } from 'react';
import { useQueryClient } from 'react-query';
import { useResetRecoilState, useSetRecoilState } from 'recoil';
-import { UseIdColorRequest, UseItemData } from 'types/inventoryTypes';
+import { UseIdColorRequest, UseItemData } from 'types/takgu/inventoryTypes';
import { instance, isAxiosError } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
-import { ITEM_ALERT_MESSAGE } from 'constants/store/itemAlertMessage';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { ITEM_ALERT_MESSAGE } from 'constants/takgu/store/itemAlertMessage';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import ColorPicker from 'components/modal/store/inventory/ColorPicker';
-import IdPreviewComponent from 'components/modal/store/inventory/IdPreviewComponent';
-import { ItemCautionContainer } from 'components/modal/store/inventory/ItemCautionContainer';
-import { useUser } from 'hooks/Layout/useUser';
-import styles from 'styles/modal/store/InventoryModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import ColorPicker from 'components/takgu/modal/store/inventory/ColorPicker';
+import IdPreviewComponent from 'components/takgu/modal/store/inventory/IdPreviewComponent';
+import { ItemCautionContainer } from 'components/takgu/modal/store/inventory/ItemCautionContainer';
+import { useUser } from 'hooks/takgu/Layout/useUser';
+import styles from 'styles/takgu/modal/store/InventoryModal.module.scss';
// TODO : 주의사항 구체화 필요
const caution = [
@@ -66,7 +66,7 @@ export default function ChangeIdColorModal({
const pickerHandler = useCallback(() => {
setOpenPicker((prev) => !prev);
}, []);
-
+
const queryClient = useQueryClient();
if (!user) return null;
diff --git a/components/modal/store/inventory/ChangeProfileBackgroundModal.tsx b/components/takgu/modal/store/inventory/ChangeProfileBackgroundModal.tsx
similarity index 84%
rename from components/modal/store/inventory/ChangeProfileBackgroundModal.tsx
rename to components/takgu/modal/store/inventory/ChangeProfileBackgroundModal.tsx
index 793553fc1..c45aa3e99 100644
--- a/components/modal/store/inventory/ChangeProfileBackgroundModal.tsx
+++ b/components/takgu/modal/store/inventory/ChangeProfileBackgroundModal.tsx
@@ -1,19 +1,19 @@
import { useState } from 'react';
import { useQueryClient } from 'react-query';
import { useResetRecoilState, useSetRecoilState } from 'recoil';
-import { UseItemData, UseItemRequest } from 'types/inventoryTypes';
-import { Modal } from 'types/modalTypes';
+import { UseItemData, UseItemRequest } from 'types/takgu/inventoryTypes';
+import { Modal } from 'types/takgu/modalTypes';
import { instance, isAxiosError } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
-import { ITEM_ALERT_MESSAGE } from 'constants/store/itemAlertMessage';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { ITEM_ALERT_MESSAGE } from 'constants/takgu/store/itemAlertMessage';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import GachaBall from 'components/modal/store/inventory/GachaBall';
-import { ItemCautionContainer } from 'components/modal/store/inventory/ItemCautionContainer';
-import styles from 'styles/modal/store/InventoryModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import GachaBall from 'components/takgu/modal/store/inventory/GachaBall';
+import { ItemCautionContainer } from 'components/takgu/modal/store/inventory/ItemCautionContainer';
+import styles from 'styles/takgu/modal/store/InventoryModal.module.scss';
const caution = [
'색상은 랜덤으로 결정됩니다.',
diff --git a/components/modal/store/inventory/ChangeProfileEdgeModal.tsx b/components/takgu/modal/store/inventory/ChangeProfileEdgeModal.tsx
similarity index 84%
rename from components/modal/store/inventory/ChangeProfileEdgeModal.tsx
rename to components/takgu/modal/store/inventory/ChangeProfileEdgeModal.tsx
index adfde5794..7a40fb92e 100644
--- a/components/modal/store/inventory/ChangeProfileEdgeModal.tsx
+++ b/components/takgu/modal/store/inventory/ChangeProfileEdgeModal.tsx
@@ -1,19 +1,19 @@
import { useState } from 'react';
import { useQueryClient } from 'react-query';
import { useResetRecoilState, useSetRecoilState } from 'recoil';
-import { UseItemData, UseItemRequest } from 'types/inventoryTypes';
-import { Modal } from 'types/modalTypes';
+import { UseItemData, UseItemRequest } from 'types/takgu/inventoryTypes';
+import { Modal } from 'types/takgu/modalTypes';
import { instance, isAxiosError } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
-import { ITEM_ALERT_MESSAGE } from 'constants/store/itemAlertMessage';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { ITEM_ALERT_MESSAGE } from 'constants/takgu/store/itemAlertMessage';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import GachaBall from 'components/modal/store/inventory/GachaBall';
-import { ItemCautionContainer } from 'components/modal/store/inventory/ItemCautionContainer';
-import styles from 'styles/modal/store/InventoryModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import GachaBall from 'components/takgu/modal/store/inventory/GachaBall';
+import { ItemCautionContainer } from 'components/takgu/modal/store/inventory/ItemCautionContainer';
+import styles from 'styles/takgu/modal/store/InventoryModal.module.scss';
const caution = [
'색상은 랜덤으로 결정됩니다.',
diff --git a/components/modal/store/inventory/ColorPicker.tsx b/components/takgu/modal/store/inventory/ColorPicker.tsx
similarity index 94%
rename from components/modal/store/inventory/ColorPicker.tsx
rename to components/takgu/modal/store/inventory/ColorPicker.tsx
index 0ca222423..6af51342d 100644
--- a/components/modal/store/inventory/ColorPicker.tsx
+++ b/components/takgu/modal/store/inventory/ColorPicker.tsx
@@ -1,7 +1,7 @@
import { Dispatch, SetStateAction } from 'react';
import { HexColorInput, HexColorPicker } from 'react-colorful';
import { MdOutlineColorLens, MdColorLens } from 'react-icons/md';
-import styles from 'styles/modal/store/ColorPicker.module.scss';
+import styles from 'styles/takgu/modal/store/ColorPicker.module.scss';
type ColorPickerProps = {
color: string;
diff --git a/components/modal/store/inventory/EdgePreview.tsx b/components/takgu/modal/store/inventory/EdgePreview.tsx
similarity index 80%
rename from components/modal/store/inventory/EdgePreview.tsx
rename to components/takgu/modal/store/inventory/EdgePreview.tsx
index 0e082cead..bc434a20e 100644
--- a/components/modal/store/inventory/EdgePreview.tsx
+++ b/components/takgu/modal/store/inventory/EdgePreview.tsx
@@ -1,7 +1,7 @@
-import { EdgeColors, RandomColors } from 'types/colorModeTypes';
-import PlayerImage from 'components/PlayerImage';
-import { useUser } from 'hooks/Layout/useUser';
-import styles from 'styles/modal/store/EdgePreview.module.scss';
+import { EdgeColors, RandomColors } from 'types/takgu/colorModeTypes';
+import PlayerImage from 'components/takgu/PlayerImage';
+import { useUser } from 'hooks/takgu/Layout/useUser';
+import styles from 'styles/takgu/modal/store/EdgePreview.module.scss';
const edgeColorList = new Map([
['BASIC', 'BASIC'],
diff --git a/components/modal/store/inventory/EditMegaphoneModal.tsx b/components/takgu/modal/store/inventory/EditMegaphoneModal.tsx
similarity index 86%
rename from components/modal/store/inventory/EditMegaphoneModal.tsx
rename to components/takgu/modal/store/inventory/EditMegaphoneModal.tsx
index d5e0e9f77..cb08f82ea 100644
--- a/components/modal/store/inventory/EditMegaphoneModal.tsx
+++ b/components/takgu/modal/store/inventory/EditMegaphoneModal.tsx
@@ -1,20 +1,20 @@
import { useEffect, useState } from 'react';
import { useQueryClient } from 'react-query';
import { useResetRecoilState, useSetRecoilState } from 'recoil';
-import { UseItemData } from 'types/inventoryTypes';
+import { UseItemData } from 'types/takgu/inventoryTypes';
import { instance, isAxiosError } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
-import { ITEM_ALERT_MESSAGE } from 'constants/store/itemAlertMessage';
-import { MegaphoneItem } from 'components/Layout/MegaPhone';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { ITEM_ALERT_MESSAGE } from 'constants/takgu/store/itemAlertMessage';
+import { MegaphoneItem } from 'components/takgu/Layout/MegaPhone';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import { ItemCautionContainer } from 'components/modal/store/inventory/ItemCautionContainer';
-import { useUser } from 'hooks/Layout/useUser';
+} from 'components/takgu/modal/ModalButton';
+import { ItemCautionContainer } from 'components/takgu/modal/store/inventory/ItemCautionContainer';
+import { useUser } from 'hooks/takgu/Layout/useUser';
import useAxiosGet from 'hooks/useAxiosGet';
-import styles from 'styles/modal/store/InventoryModal.module.scss';
+import styles from 'styles/takgu/modal/store/InventoryModal.module.scss';
type MegaphoneData = {
megaphoneId: number;
diff --git a/components/modal/store/inventory/GachaBall.tsx b/components/takgu/modal/store/inventory/GachaBall.tsx
similarity index 85%
rename from components/modal/store/inventory/GachaBall.tsx
rename to components/takgu/modal/store/inventory/GachaBall.tsx
index c4689ec7f..9e777b8c3 100644
--- a/components/modal/store/inventory/GachaBall.tsx
+++ b/components/takgu/modal/store/inventory/GachaBall.tsx
@@ -1,4 +1,4 @@
-import styles from 'styles/modal/store/GachaBall.module.scss';
+import styles from 'styles/takgu/modal/store/GachaBall.module.scss';
export default function GachaBall() {
const balls = Array.from({ length: 11 }, (el, i) => 'ball' + i.toString());
diff --git a/components/modal/store/inventory/GachaConfetti.tsx b/components/takgu/modal/store/inventory/GachaConfetti.tsx
similarity index 100%
rename from components/modal/store/inventory/GachaConfetti.tsx
rename to components/takgu/modal/store/inventory/GachaConfetti.tsx
diff --git a/components/modal/store/inventory/GachaModal.tsx b/components/takgu/modal/store/inventory/GachaModal.tsx
similarity index 64%
rename from components/modal/store/inventory/GachaModal.tsx
rename to components/takgu/modal/store/inventory/GachaModal.tsx
index 4d6d23fb3..0b12b3b7b 100644
--- a/components/modal/store/inventory/GachaModal.tsx
+++ b/components/takgu/modal/store/inventory/GachaModal.tsx
@@ -1,14 +1,14 @@
import { useResetRecoilState } from 'recoil';
-import { IRandomItem } from 'types/modalTypes';
-import { modalState } from 'utils/recoil/modal';
+import { IRandomItem } from 'types/takgu/modalTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import BackgroundPreview from 'components/modal/store/inventory/BackgroundPreview';
-import EdgePreview from 'components/modal/store/inventory/EdgePreview';
-import GachaConfetti from 'components/modal/store/inventory/GachaConfetti';
-import styles from 'styles/modal/store/GachaModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import BackgroundPreview from 'components/takgu/modal/store/inventory/BackgroundPreview';
+import EdgePreview from 'components/takgu/modal/store/inventory/EdgePreview';
+import GachaConfetti from 'components/takgu/modal/store/inventory/GachaConfetti';
+import styles from 'styles/takgu/modal/store/GachaModal.module.scss';
export default function GachaModal({ item, color }: IRandomItem) {
const resetModal = useResetRecoilState(modalState);
diff --git a/components/modal/store/inventory/IdPreviewComponent.tsx b/components/takgu/modal/store/inventory/IdPreviewComponent.tsx
similarity index 64%
rename from components/modal/store/inventory/IdPreviewComponent.tsx
rename to components/takgu/modal/store/inventory/IdPreviewComponent.tsx
index 542eb57c3..a1f8f1e55 100644
--- a/components/modal/store/inventory/IdPreviewComponent.tsx
+++ b/components/takgu/modal/store/inventory/IdPreviewComponent.tsx
@@ -1,7 +1,7 @@
-import { RankUser, NormalUser } from 'types/rankTypes';
-import { NormalListItem } from 'components/rank/NormalListItem';
-import { RankListItem } from 'components/rank/RankListItem';
-import styles from 'styles/modal/store/InventoryModal.module.scss';
+import { RankUser, NormalUser } from 'types/takgu/rankTypes';
+import { NormalListItem } from 'components/takgu/rank/NormalListItem';
+import { RankListItem } from 'components/takgu/rank/RankListItem';
+import styles from 'styles/takgu/modal/store/InventoryModal.module.scss';
type IdPreviewProps = {
intraId: string;
@@ -14,7 +14,7 @@ export default function IdPreviewComponent({ intraId, color }: IdPreviewProps) {
intraId: intraId,
statusMessage: '상태메시지',
ppp: 42,
- tierImageUri: '/image/fallBackSrc.jpeg', // NOTE : preview에서 쓸 이미지 생각해보기 (user data로 받아올 실제 이미지?)
+ tierImageUri: '/image/takgu/fallBackSrc.jpeg', // NOTE : preview에서 쓸 이미지 생각해보기 (user data로 받아올 실제 이미지?)
textColor: color,
};
const normalDummyData: NormalUser = {
diff --git a/components/modal/store/inventory/ItemCautionContainer.tsx b/components/takgu/modal/store/inventory/ItemCautionContainer.tsx
similarity index 85%
rename from components/modal/store/inventory/ItemCautionContainer.tsx
rename to components/takgu/modal/store/inventory/ItemCautionContainer.tsx
index 413e21b43..7cae7c5fe 100644
--- a/components/modal/store/inventory/ItemCautionContainer.tsx
+++ b/components/takgu/modal/store/inventory/ItemCautionContainer.tsx
@@ -1,4 +1,4 @@
-import styles from 'styles/modal/store/InventoryModal.module.scss';
+import styles from 'styles/takgu/modal/store/InventoryModal.module.scss';
type ItemCautionContainerProps = {
caution: string[];
diff --git a/components/modal/store/inventory/NewMegaphoneModal.tsx b/components/takgu/modal/store/inventory/NewMegaphoneModal.tsx
similarity index 88%
rename from components/modal/store/inventory/NewMegaphoneModal.tsx
rename to components/takgu/modal/store/inventory/NewMegaphoneModal.tsx
index 1e5bb8c2e..ab21a48aa 100644
--- a/components/modal/store/inventory/NewMegaphoneModal.tsx
+++ b/components/takgu/modal/store/inventory/NewMegaphoneModal.tsx
@@ -1,19 +1,19 @@
import { useState } from 'react';
import { useQueryClient } from 'react-query';
import { useResetRecoilState, useSetRecoilState } from 'recoil';
-import { UseItemData, UseMegaphoneRequest } from 'types/inventoryTypes';
+import { UseItemData, UseMegaphoneRequest } from 'types/takgu/inventoryTypes';
import { instance, isAxiosError } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
-import { ITEM_ALERT_MESSAGE } from 'constants/store/itemAlertMessage';
-import { MegaphoneItem } from 'components/Layout/MegaPhone';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { ITEM_ALERT_MESSAGE } from 'constants/takgu/store/itemAlertMessage';
+import { MegaphoneItem } from 'components/takgu/Layout/MegaPhone';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import { ItemCautionContainer } from 'components/modal/store/inventory/ItemCautionContainer';
-import { useUser } from 'hooks/Layout/useUser';
-import styles from 'styles/modal/store/InventoryModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import { ItemCautionContainer } from 'components/takgu/modal/store/inventory/ItemCautionContainer';
+import { useUser } from 'hooks/takgu/Layout/useUser';
+import styles from 'styles/takgu/modal/store/InventoryModal.module.scss';
const MAX_LENGTH = 30;
diff --git a/components/modal/store/inventory/ProfileImageModal.tsx b/components/takgu/modal/store/inventory/ProfileImageModal.tsx
similarity index 90%
rename from components/modal/store/inventory/ProfileImageModal.tsx
rename to components/takgu/modal/store/inventory/ProfileImageModal.tsx
index ed4918414..359ecf44a 100644
--- a/components/modal/store/inventory/ProfileImageModal.tsx
+++ b/components/takgu/modal/store/inventory/ProfileImageModal.tsx
@@ -4,18 +4,18 @@ import { useQueryClient } from 'react-query';
import { useResetRecoilState, useSetRecoilState } from 'recoil';
import { FaArrowRight } from 'react-icons/fa';
import { TbQuestionMark } from 'react-icons/tb';
-import { UseItemData } from 'types/inventoryTypes';
+import { UseItemData } from 'types/takgu/inventoryTypes';
import { instance, isAxiosError } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
-import { ITEM_ALERT_MESSAGE } from 'constants/store/itemAlertMessage';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { ITEM_ALERT_MESSAGE } from 'constants/takgu/store/itemAlertMessage';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import { useUser } from 'hooks/Layout/useUser';
+} from 'components/takgu/modal/ModalButton';
+import { useUser } from 'hooks/takgu/Layout/useUser';
import useUploadImg from 'hooks/useUploadImg';
-import styles from 'styles/modal/store/InventoryModal.module.scss';
+import styles from 'styles/takgu/modal/store/InventoryModal.module.scss';
import { ItemCautionContainer } from './ItemCautionContainer';
const cautions = [
@@ -88,7 +88,7 @@ export default function ProfileImageModal({
);
formData.append(
'profileImage',
- new Blob([imgData], { type: 'image/jpeg' })
+ new Blob([imgData], { type: 'image/takgu/jpeg' })
);
await instance.post('/pingpong/users/profile-image', formData);
queryClient.invalidateQueries('user');
@@ -140,7 +140,7 @@ export default function ProfileImageModal({
)}
diff --git a/components/modal/store/purchase/BuyModal.tsx b/components/takgu/modal/store/purchase/BuyModal.tsx
similarity index 90%
rename from components/modal/store/purchase/BuyModal.tsx
rename to components/takgu/modal/store/purchase/BuyModal.tsx
index e30986ed1..7ad2f34d1 100644
--- a/components/modal/store/purchase/BuyModal.tsx
+++ b/components/takgu/modal/store/purchase/BuyModal.tsx
@@ -1,16 +1,16 @@
import { useState } from 'react';
import { useQueryClient } from 'react-query';
import { useSetRecoilState, useResetRecoilState } from 'recoil';
-import { PriceTag } from 'types/modalTypes';
+import { PriceTag } from 'types/takgu/modalTypes';
import { instance, isAxiosError } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
-import { PURCHASE_ALERT_MESSAGE } from 'constants/store/purchaseAlertMessage';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { PURCHASE_ALERT_MESSAGE } from 'constants/takgu/store/purchaseAlertMessage';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import styles from 'styles/modal/store/BuyModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import styles from 'styles/takgu/modal/store/BuyModal.module.scss';
export default function BuyModal({ itemId, product, price }: PriceTag) {
const [isLoading, setIsLoading] = useState(false);
diff --git a/components/modal/store/purchase/GiftModal.tsx b/components/takgu/modal/store/purchase/GiftModal.tsx
similarity index 88%
rename from components/modal/store/purchase/GiftModal.tsx
rename to components/takgu/modal/store/purchase/GiftModal.tsx
index b9c09f99d..aa5cabb08 100644
--- a/components/modal/store/purchase/GiftModal.tsx
+++ b/components/takgu/modal/store/purchase/GiftModal.tsx
@@ -1,18 +1,18 @@
import { useState } from 'react';
import { useQueryClient } from 'react-query';
import { useSetRecoilState, useResetRecoilState } from 'recoil';
-import { GiftRequest } from 'types/itemTypes';
-import { PriceTag } from 'types/modalTypes';
+import { GiftRequest } from 'types/takgu/itemTypes';
+import { PriceTag } from 'types/takgu/modalTypes';
import { instance, isAxiosError } from 'utils/axios';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
-import { PURCHASE_ALERT_MESSAGE } from 'constants/store/purchaseAlertMessage';
+import { modalState } from 'utils/recoil/takgu/modal';
+import { PURCHASE_ALERT_MESSAGE } from 'constants/takgu/store/purchaseAlertMessage';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import GiftSearchBar from 'components/store/purchase/GiftSearchBar';
-import styles from 'styles/modal/store/GiftModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import GiftSearchBar from 'components/takgu/store/purchase/GiftSearchBar';
+import styles from 'styles/takgu/modal/store/GiftModal.module.scss';
export default function GiftModal({ itemId, product, price }: PriceTag) {
const [isLoading, setIsLoading] = useState(false);
diff --git a/components/modal/store/purchase/NoCoinModal.tsx b/components/takgu/modal/store/purchase/NoCoinModal.tsx
similarity index 83%
rename from components/modal/store/purchase/NoCoinModal.tsx
rename to components/takgu/modal/store/purchase/NoCoinModal.tsx
index 33dcae439..1a4fc082c 100644
--- a/components/modal/store/purchase/NoCoinModal.tsx
+++ b/components/takgu/modal/store/purchase/NoCoinModal.tsx
@@ -1,5 +1,5 @@
-import useNoCoinModal from 'hooks/modal/store/purchase/useNoCoinModal';
-import styles from 'styles/modal/store/NoCoinModal.module.scss';
+import useNoCoinModal from 'hooks/takgu/modal/store/purchase/useNoCoinModal';
+import styles from 'styles/takgu/modal/store/NoCoinModal.module.scss';
export default function NoCoinModal() {
const { onPlay, onCancel } = useNoCoinModal();
diff --git a/components/modal/tournament/TournamentManualModal.tsx b/components/takgu/modal/tournament/TournamentManualModal.tsx
similarity index 93%
rename from components/modal/tournament/TournamentManualModal.tsx
rename to components/takgu/modal/tournament/TournamentManualModal.tsx
index 65fce0f1b..018759009 100644
--- a/components/modal/tournament/TournamentManualModal.tsx
+++ b/components/takgu/modal/tournament/TournamentManualModal.tsx
@@ -1,10 +1,10 @@
import { useSetRecoilState } from 'recoil';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import styles from 'styles/modal/match/MatchManualModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import styles from 'styles/takgu/modal/match/MatchManualModal.module.scss';
type contentType = {
title: React.ReactNode;
@@ -99,7 +99,7 @@ function ContentTitle({ title, icon }: contentTitleProps) {
icon = typeof icon === 'string' ? {icon} : icon;
return (
({level})}
) : (
-
+
{intraId}
{level && ({level})}
diff --git a/components/rank/RankList.tsx b/components/takgu/rank/RankList.tsx
similarity index 74%
rename from components/rank/RankList.tsx
rename to components/takgu/rank/RankList.tsx
index 267aa9c3c..2fb91c574 100644
--- a/components/rank/RankList.tsx
+++ b/components/takgu/rank/RankList.tsx
@@ -1,12 +1,12 @@
import React, { useState } from 'react';
import { useRecoilValue } from 'recoil';
-import { RankUser, NormalUser, Rank } from 'types/rankTypes';
-import { colorToggleSelector } from 'utils/recoil/colorMode';
-import { NormalListItem } from 'components/rank/NormalListItem';
-import RankListFrame from 'components/rank/RankListFrame';
-import { RankListItem } from 'components/rank/RankListItem';
-import RankListMain from 'components/rank/topRank/RankListMain';
-import useRankList from 'hooks/rank/useRankList';
+import { RankUser, NormalUser, Rank } from 'types/takgu/rankTypes';
+import { colorToggleSelector } from 'utils/recoil/takgu/colorMode';
+import { NormalListItem } from 'components/takgu/rank/NormalListItem';
+import RankListFrame from 'components/takgu/rank/RankListFrame';
+import { RankListItem } from 'components/takgu/rank/RankListItem';
+import RankListMain from 'components/takgu/rank/topRank/RankListMain';
+import useRankList from 'hooks/takgu/rank/useRankList';
interface RankListProps {
season?: number;
diff --git a/components/rank/RankListFrame.tsx b/components/takgu/rank/RankListFrame.tsx
similarity index 89%
rename from components/rank/RankListFrame.tsx
rename to components/takgu/rank/RankListFrame.tsx
index 8cee3c47f..2170049c4 100644
--- a/components/rank/RankListFrame.tsx
+++ b/components/takgu/rank/RankListFrame.tsx
@@ -1,8 +1,8 @@
import { useRouter } from 'next/router';
import { useRecoilValue } from 'recoil';
-import { colorToggleSelector } from 'utils/recoil/colorMode';
+import { colorToggleSelector } from 'utils/recoil/takgu/colorMode';
import PageNation from 'components/Pagination';
-import styles from 'styles/rank/RankList.module.scss';
+import styles from 'styles/takgu/rank/RankList.module.scss';
interface PageInfo {
currentPage?: number;
totalPage?: number;
@@ -27,7 +27,7 @@ export default function RankListFrame({
const pageChangeHandler = (pages: number) => {
pageInfo.setPage(pages);
- router.push('/rank');
+ router.push('/takgu/rank');
};
return (
diff --git a/components/rank/RankListItem.tsx b/components/takgu/rank/RankListItem.tsx
similarity index 82%
rename from components/rank/RankListItem.tsx
rename to components/takgu/rank/RankListItem.tsx
index 05cd00ddb..3504f1f7b 100644
--- a/components/rank/RankListItem.tsx
+++ b/components/takgu/rank/RankListItem.tsx
@@ -1,8 +1,8 @@
import Link from 'next/link';
-import { RankUser } from 'types/rankTypes';
-import PlayerImage from 'components/PlayerImage';
-import { useUser } from 'hooks/Layout/useUser';
-import styles from 'styles/rank/RankList.module.scss';
+import { RankUser } from 'types/takgu/rankTypes';
+import PlayerImage from 'components/takgu/PlayerImage';
+import { useUser } from 'hooks/takgu/Layout/useUser';
+import styles from 'styles/takgu/rank/RankList.module.scss';
type RankListItemProps = {
user: RankUser;
@@ -41,7 +41,7 @@ export function RankListItem({ user, textColorPreview }: RankListItemProps) {
{textColorPreview ? (
{icon ? icon : null}
diff --git a/components/modal/tournament/TournamentRegistryModal.tsx b/components/takgu/modal/tournament/TournamentRegistryModal.tsx
similarity index 94%
rename from components/modal/tournament/TournamentRegistryModal.tsx
rename to components/takgu/modal/tournament/TournamentRegistryModal.tsx
index 8a16626bc..d07095b92 100644
--- a/components/modal/tournament/TournamentRegistryModal.tsx
+++ b/components/takgu/modal/tournament/TournamentRegistryModal.tsx
@@ -1,19 +1,19 @@
import { useCallback, useEffect, useState } from 'react';
import { useSetRecoilState } from 'recoil';
import { MdPeopleAlt } from 'react-icons/md';
-import { QUILL_FORMATS } from 'types/quillTypes';
-import { TournamentInfo } from 'types/tournamentTypes';
+import { QUILL_FORMATS } from 'types/takgu/quillTypes';
+import { TournamentInfo } from 'types/takgu/tournamentTypes';
import { instance } from 'utils/axios';
import { dateToKRLocaleTimeString } from 'utils/handleTime';
import { errorState } from 'utils/recoil/error';
-import { modalState } from 'utils/recoil/modal';
+import { modalState } from 'utils/recoil/takgu/modal';
import { toastState } from 'utils/recoil/toast';
import DynamicQuill from 'components/DynamicQuill';
import {
ModalButtonContainer,
ModalButton,
-} from 'components/modal/ModalButton';
-import styles from 'styles/modal/event/TournamentRegistryModal.module.scss';
+} from 'components/takgu/modal/ModalButton';
+import styles from 'styles/takgu/modal/event/TournamentRegistryModal.module.scss';
import 'react-quill/dist/quill.bubble.css';
export default function TournamentRegistryModal({
@@ -140,9 +140,7 @@ export default function TournamentRegistryModal({
const buttonMappings: Record = {
LOADING: {
content: '로딩중...',
- handler: () => {
- console.log('loading...');
- },
+ handler: null,
},
BEFORE: {
content: '등록',
diff --git a/components/mode/modeItems/IsMineCheckBox.tsx b/components/takgu/mode/modeItems/IsMineCheckBox.tsx
similarity index 88%
rename from components/mode/modeItems/IsMineCheckBox.tsx
rename to components/takgu/mode/modeItems/IsMineCheckBox.tsx
index 35678d347..52acc9987 100644
--- a/components/mode/modeItems/IsMineCheckBox.tsx
+++ b/components/takgu/mode/modeItems/IsMineCheckBox.tsx
@@ -1,4 +1,4 @@
-import styles from 'styles/mode/IsMineCheckBox.module.scss';
+import styles from 'styles/takgu/mode/IsMineCheckBox.module.scss';
interface IsMineCheckBoxProps {
isMine: boolean;
diff --git a/components/mode/modeItems/ModeRadiobox.tsx b/components/takgu/mode/modeItems/ModeRadiobox.tsx
similarity index 82%
rename from components/mode/modeItems/ModeRadiobox.tsx
rename to components/takgu/mode/modeItems/ModeRadiobox.tsx
index 30ca68499..85791e8ff 100644
--- a/components/mode/modeItems/ModeRadiobox.tsx
+++ b/components/takgu/mode/modeItems/ModeRadiobox.tsx
@@ -1,6 +1,6 @@
-import { SeasonMode } from 'types/mainType';
-import { RadioBoxWrapper } from 'components/mode/modeItems/RadioBoxWrapper';
-import styles from 'styles/mode/ModeRadiobox.module.scss';
+import { SeasonMode } from 'types/takgu/mainType';
+import { RadioBoxWrapper } from 'components/takgu/mode/modeItems/RadioBoxWrapper';
+import styles from 'styles/takgu/mode/ModeRadiobox.module.scss';
interface ModeRadioboxProps {
mode: SeasonMode;
diff --git a/components/mode/modeItems/ModeToggle.tsx b/components/takgu/mode/modeItems/ModeToggle.tsx
similarity index 89%
rename from components/mode/modeItems/ModeToggle.tsx
rename to components/takgu/mode/modeItems/ModeToggle.tsx
index 8fbea1267..dffba4051 100644
--- a/components/mode/modeItems/ModeToggle.tsx
+++ b/components/takgu/mode/modeItems/ModeToggle.tsx
@@ -1,4 +1,4 @@
-import styles from 'styles/mode/ModeToggle.module.scss';
+import styles from 'styles/takgu/mode/ModeToggle.module.scss';
interface ModeToggleProps {
id: string;
diff --git a/components/mode/modeItems/RadioBoxWrapper.tsx b/components/takgu/mode/modeItems/RadioBoxWrapper.tsx
similarity index 88%
rename from components/mode/modeItems/RadioBoxWrapper.tsx
rename to components/takgu/mode/modeItems/RadioBoxWrapper.tsx
index ef9f40175..1a93e772f 100644
--- a/components/mode/modeItems/RadioBoxWrapper.tsx
+++ b/components/takgu/mode/modeItems/RadioBoxWrapper.tsx
@@ -1,4 +1,4 @@
-import styles from 'styles/mode/ModeRadiobox.module.scss';
+import styles from 'styles/takgu/mode/ModeRadiobox.module.scss';
type RadioBoxWrapperProps = {
children: React.ReactNode;
diff --git a/components/mode/modeItems/SeasonDropDown.tsx b/components/takgu/mode/modeItems/SeasonDropDown.tsx
similarity index 58%
rename from components/mode/modeItems/SeasonDropDown.tsx
rename to components/takgu/mode/modeItems/SeasonDropDown.tsx
index c5e60d7b5..a40dd3655 100644
--- a/components/mode/modeItems/SeasonDropDown.tsx
+++ b/components/takgu/mode/modeItems/SeasonDropDown.tsx
@@ -1,5 +1,5 @@
-import { Season } from 'types/seasonTypes';
-import styles from 'styles/mode/SeasonDropDown.module.scss';
+import { Season } from 'types/takgu/seasonTypes';
+import styles from 'styles/takgu/mode/SeasonDropDown.module.scss';
interface SeasonDropDownProps {
seasonList: Season[];
@@ -15,12 +15,11 @@ export default function SeasonDropDown({
return (
);
diff --git a/components/mode/modeItems/StoreManualModeRadioBox.tsx b/components/takgu/mode/modeItems/StoreManualModeRadioBox.tsx
similarity index 79%
rename from components/mode/modeItems/StoreManualModeRadioBox.tsx
rename to components/takgu/mode/modeItems/StoreManualModeRadioBox.tsx
index 5287dcb03..112704b19 100644
--- a/components/mode/modeItems/StoreManualModeRadioBox.tsx
+++ b/components/takgu/mode/modeItems/StoreManualModeRadioBox.tsx
@@ -1,6 +1,6 @@
-import { StoreManualMode } from 'types/storeTypes';
-import { RadioBoxWrapper } from 'components/mode/modeItems/RadioBoxWrapper';
-import styles from 'styles/mode/ModeRadiobox.module.scss';
+import { StoreManualMode } from 'types/takgu/storeTypes';
+import { RadioBoxWrapper } from 'components/takgu/mode/modeItems/RadioBoxWrapper';
+import styles from 'styles/takgu/mode/ModeRadiobox.module.scss';
type StoreManualModeRadioBoxProps = {
mode: StoreManualMode;
diff --git a/components/mode/modeItems/StoreModeRadioBox.tsx b/components/takgu/mode/modeItems/StoreModeRadioBox.tsx
similarity index 79%
rename from components/mode/modeItems/StoreModeRadioBox.tsx
rename to components/takgu/mode/modeItems/StoreModeRadioBox.tsx
index f1f758591..5cb927784 100644
--- a/components/mode/modeItems/StoreModeRadioBox.tsx
+++ b/components/takgu/mode/modeItems/StoreModeRadioBox.tsx
@@ -1,6 +1,6 @@
-import { StoreMode } from 'types/storeTypes';
-import { RadioBoxWrapper } from 'components/mode/modeItems/RadioBoxWrapper';
-import styles from 'styles/mode/ModeRadiobox.module.scss';
+import { StoreMode } from 'types/takgu/storeTypes';
+import { RadioBoxWrapper } from 'components/takgu/mode/modeItems/RadioBoxWrapper';
+import styles from 'styles/takgu/mode/ModeRadiobox.module.scss';
type StoreModeRadioBoxProps = {
mode: StoreMode;
diff --git a/components/mode/modeItems/UserGameSearchBar.tsx b/components/takgu/mode/modeItems/UserGameSearchBar.tsx
similarity index 93%
rename from components/mode/modeItems/UserGameSearchBar.tsx
rename to components/takgu/mode/modeItems/UserGameSearchBar.tsx
index b5fb8361b..e6ca3979d 100644
--- a/components/mode/modeItems/UserGameSearchBar.tsx
+++ b/components/takgu/mode/modeItems/UserGameSearchBar.tsx
@@ -3,7 +3,7 @@ import { useEffect } from 'react';
import { GoSearch } from 'react-icons/go';
import { IoIosCloseCircle } from 'react-icons/io';
import useSearchBar from 'hooks/useSearchBar';
-import styles from 'styles/main/SearchBar.module.scss';
+import styles from 'styles/takgu/main/SearchBar.module.scss';
export default function UserGameSearchBar() {
const router = useRouter();
@@ -30,7 +30,7 @@ export default function UserGameSearchBar() {
) => {
setKeyword(intraId);
setShowDropDown(false);
- router.push(`/game?intraId=${intraId}`, undefined, {
+ router.push(`/takgu/game?intraId=${intraId}`, undefined, {
shallow: true,
});
};
diff --git a/components/mode/modeWraps/GameModeWrap.tsx b/components/takgu/mode/modeWraps/GameModeWrap.tsx
similarity index 77%
rename from components/mode/modeWraps/GameModeWrap.tsx
rename to components/takgu/mode/modeWraps/GameModeWrap.tsx
index 3eb75aa91..ebfa0a25e 100644
--- a/components/mode/modeWraps/GameModeWrap.tsx
+++ b/components/takgu/mode/modeWraps/GameModeWrap.tsx
@@ -1,13 +1,13 @@
import { useRouter } from 'next/router';
import React, { useEffect } from 'react';
import { useSetRecoilState } from 'recoil';
-import { SeasonMode, MatchMode } from 'types/mainType';
-import { colorModeState } from 'utils/recoil/colorMode';
-import ModeRadiobox from 'components/mode/modeItems/ModeRadiobox';
-import SeasonDropDown from 'components/mode/modeItems/SeasonDropDown';
-import UserGameSearchBar from 'components/mode/modeItems/UserGameSearchBar';
-import useSeasonDropDown from 'hooks/mode/useSeasonDropDown';
-import styles from 'styles/mode/ModeWrap.module.scss';
+import { SeasonMode, MatchMode } from 'types/takgu/mainType';
+import { colorModeState } from 'utils/recoil/takgu/colorMode';
+import ModeRadiobox from 'components/takgu/mode/modeItems/ModeRadiobox';
+import SeasonDropDown from 'components/takgu/mode/modeItems/SeasonDropDown';
+import UserGameSearchBar from 'components/takgu/mode/modeItems/UserGameSearchBar';
+import useSeasonDropDown from 'hooks/takgu/mode/useSeasonDropDown';
+import styles from 'styles/takgu/mode/ModeWrap.module.scss';
interface GameModeWrapProps {
children: React.ReactNode;
diff --git a/components/mode/modeWraps/MatchModeWrap.tsx b/components/takgu/mode/modeWraps/MatchModeWrap.tsx
similarity index 79%
rename from components/mode/modeWraps/MatchModeWrap.tsx
rename to components/takgu/mode/modeWraps/MatchModeWrap.tsx
index 45787f384..027a684ce 100644
--- a/components/mode/modeWraps/MatchModeWrap.tsx
+++ b/components/takgu/mode/modeWraps/MatchModeWrap.tsx
@@ -1,9 +1,9 @@
import React, { SetStateAction, Dispatch } from 'react';
import { useSetRecoilState } from 'recoil';
-import { MatchMode } from 'types/mainType';
-import { Match } from 'types/matchTypes';
-import { colorModeState } from 'utils/recoil/colorMode';
-import ModeRadiobox from 'components/mode/modeItems/ModeRadiobox';
+import { MatchMode } from 'types/takgu/mainType';
+import { Match } from 'types/takgu/matchTypes';
+import { colorModeState } from 'utils/recoil/takgu/colorMode';
+import ModeRadiobox from 'components/takgu/mode/modeItems/ModeRadiobox';
interface MatchModeWrapProps {
children: React.ReactNode;
diff --git a/components/mode/modeWraps/ProfileModeWrap.tsx b/components/takgu/mode/modeWraps/ProfileModeWrap.tsx
similarity index 74%
rename from components/mode/modeWraps/ProfileModeWrap.tsx
rename to components/takgu/mode/modeWraps/ProfileModeWrap.tsx
index 91bf87985..6332da744 100644
--- a/components/mode/modeWraps/ProfileModeWrap.tsx
+++ b/components/takgu/mode/modeWraps/ProfileModeWrap.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import SeasonDropDown from 'components/mode/modeItems/SeasonDropDown';
-import useSeasonDropDown from 'hooks/mode/useSeasonDropDown';
-import styles from 'styles/mode/ModeWrap.module.scss';
+import SeasonDropDown from 'components/takgu/mode/modeItems/SeasonDropDown';
+import useSeasonDropDown from 'hooks/takgu/mode/useSeasonDropDown';
+import styles from 'styles/takgu/mode/ModeWrap.module.scss';
interface ProfileModeWrapProps {
children: React.ReactNode;
diff --git a/components/mode/modeWraps/RankModeWrap.tsx b/components/takgu/mode/modeWraps/RankModeWrap.tsx
similarity index 76%
rename from components/mode/modeWraps/RankModeWrap.tsx
rename to components/takgu/mode/modeWraps/RankModeWrap.tsx
index eae3fbc40..ce3900a97 100644
--- a/components/mode/modeWraps/RankModeWrap.tsx
+++ b/components/takgu/mode/modeWraps/RankModeWrap.tsx
@@ -1,10 +1,10 @@
import React, { useEffect, useState } from 'react';
import { useRecoilState } from 'recoil';
-import { colorToggleSelector } from 'utils/recoil/colorMode';
-import ModeToggle from 'components/mode/modeItems/ModeToggle';
-import SeasonDropDown from 'components/mode/modeItems/SeasonDropDown';
-import useSeasonDropDown from 'hooks/mode/useSeasonDropDown';
-import styles from 'styles/mode/ModeWrap.module.scss';
+import { colorToggleSelector } from 'utils/recoil/takgu/colorMode';
+import ModeToggle from 'components/takgu/mode/modeItems/ModeToggle';
+import SeasonDropDown from 'components/takgu/mode/modeItems/SeasonDropDown';
+import useSeasonDropDown from 'hooks/takgu/mode/useSeasonDropDown';
+import styles from 'styles/takgu/mode/ModeWrap.module.scss';
interface RankModeWrapProps {
children: React.ReactNode;
}
@@ -13,7 +13,7 @@ export default function RankModeWrap({ children }: RankModeWrapProps) {
const [Mode, setMode] = useRecoilState(colorToggleSelector);
const { seasonList, season, seasonDropDownHandler } = useSeasonDropDown();
const [showSeasons, setShowSeasons] = useState(true);
-
+
const onToggle = (): void => {
setMode(Mode === 'RANK' ? 'NORMAL' : 'RANK');
};
diff --git a/components/mode/modeWraps/StoreModeWrap.tsx b/components/takgu/mode/modeWraps/StoreModeWrap.tsx
similarity index 73%
rename from components/mode/modeWraps/StoreModeWrap.tsx
rename to components/takgu/mode/modeWraps/StoreModeWrap.tsx
index d1d2e7b58..688e6aed6 100644
--- a/components/mode/modeWraps/StoreModeWrap.tsx
+++ b/components/takgu/mode/modeWraps/StoreModeWrap.tsx
@@ -1,12 +1,12 @@
import { Dispatch, SetStateAction } from 'react';
import { useSetRecoilState } from 'recoil';
-import { Modal } from 'types/modalTypes';
-import { StoreMode } from 'types/storeTypes';
-import { ICoin } from 'types/userTypes';
-import { modalState } from 'utils/recoil/modal';
-import StoreModeRadioBox from 'components/mode/modeItems/StoreModeRadioBox';
-import CoinImage from 'components/store/CoinImage';
-import styles from 'styles/mode/StoreModeWrap.module.scss';
+import { Modal } from 'types/takgu/modalTypes';
+import { StoreMode } from 'types/takgu/storeTypes';
+import { ICoin } from 'types/takgu/userTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
+import StoreModeRadioBox from 'components/takgu/mode/modeItems/StoreModeRadioBox';
+import CoinImage from 'components/takgu/store/CoinImage';
+import styles from 'styles/takgu/mode/StoreModeWrap.module.scss';
type StoreModeWrapProps = {
coin: ICoin;
diff --git a/components/party/PartyCreate.tsx b/components/takgu/party/PartyCreate.tsx
similarity index 95%
rename from components/party/PartyCreate.tsx
rename to components/takgu/party/PartyCreate.tsx
index 96db85dc0..c3b0602c9 100644
--- a/components/party/PartyCreate.tsx
+++ b/components/takgu/party/PartyCreate.tsx
@@ -1,7 +1,7 @@
import { useRouter } from 'next/router';
import { FormEvent, useState } from 'react';
import { useSetRecoilState } from 'recoil';
-import { PartyCategory, PartyCreateForm } from 'types/partyTypes';
+import { PartyCategory, PartyCreateForm } from 'types/takgu/partyTypes';
import { instance } from 'utils/axios';
import { getFormattedDateToString } from 'utils/handleTime';
import { toastState } from 'utils/recoil/toast';
@@ -10,11 +10,11 @@ import {
hourOptions,
minuteOptions,
peopleOptions,
-} from 'constants/party/createOptions';
-import LoadingSpinner from 'components/UI/LoadingSpinner';
-import usePartyForm from 'hooks/party/usePartyForm';
-import { usePartyTemplate } from 'hooks/party/usePartyTemplate';
-import styles from 'styles/party/PartyCreate.module.scss';
+} from 'constants/takgu/party/createOptions';
+import LoadingSpinner from 'components/takgu/UI/LoadingSpinner';
+import usePartyForm from 'hooks/takgu/party/usePartyForm';
+import { usePartyTemplate } from 'hooks/takgu/party/usePartyTemplate';
+import styles from 'styles/takgu/party/PartyCreate.module.scss';
// ================================================================================
// CategorySelection: 방 카테고리 및 템플릿 선택
@@ -153,7 +153,7 @@ function DetailCustomization({
errorMessage
? await Promise.reject(new Error(errorMessage))
: await instance.post('/party/rooms', partyForm).then(({ data }) => {
- router.push(`/party/room?id=${data.roomId}`);
+ router.push(`/takgu/party/room?id=${data.roomId}`);
});
} catch (e) {
setSnackBar({
diff --git a/components/party/PartyMain.tsx b/components/takgu/party/PartyMain.tsx
similarity index 93%
rename from components/party/PartyMain.tsx
rename to components/takgu/party/PartyMain.tsx
index 24191d289..46d2cbe94 100644
--- a/components/party/PartyMain.tsx
+++ b/components/takgu/party/PartyMain.tsx
@@ -3,9 +3,9 @@ import { useRouter } from 'next/router';
import { useState } from 'react';
import { useSetRecoilState } from 'recoil';
import { FaQuestion, FaSearch } from 'react-icons/fa';
-import { PartyCategory, PartyRoom } from 'types/partyTypes';
-import { modalState } from 'utils/recoil/modal';
-import styles from 'styles/party/PartyMain.module.scss';
+import { PartyCategory, PartyRoom } from 'types/takgu/partyTypes';
+import { modalState } from 'utils/recoil/takgu/modal';
+import styles from 'styles/takgu/party/PartyMain.module.scss';
import PartyRoomListItem from './PartyRoomListItem';
// ================================================================================
@@ -36,7 +36,10 @@ function JoinedRooms({ joinedPartyRooms, penaltyPeroid }: JoinedRoomsProps) {
패널티 {penaltyPeroid}
) : (
-
+
방 만들기
)}
diff --git a/components/party/PartyRoomListItem.tsx b/components/takgu/party/PartyRoomListItem.tsx
similarity index 87%
rename from components/party/PartyRoomListItem.tsx
rename to components/takgu/party/PartyRoomListItem.tsx
index 9c67526e6..f1259df93 100644
--- a/components/party/PartyRoomListItem.tsx
+++ b/components/takgu/party/PartyRoomListItem.tsx
@@ -1,7 +1,7 @@
import Link from 'next/link';
-import { PartyRoom } from 'types/partyTypes';
+import { PartyRoom } from 'types/takgu/partyTypes';
import { getRemainTime } from 'utils/handleTime';
-import styles from 'styles/party/PartyRoomListItem.module.scss';
+import styles from 'styles/takgu/party/PartyRoomListItem.module.scss';
export default function PartyRoomListItem({ room }: { room: PartyRoom }) {
const roomStatusKo =
@@ -14,7 +14,7 @@ export default function PartyRoomListItem({ room }: { room: PartyRoom }) {
return (
{intraId}
) : (
-
+
{intraId}
)}
diff --git a/components/rank/topRank/RankListItemMain.tsx b/components/takgu/rank/topRank/RankListItemMain.tsx
similarity index 85%
rename from components/rank/topRank/RankListItemMain.tsx
rename to components/takgu/rank/topRank/RankListItemMain.tsx
index b27177d09..767fdbc60 100644
--- a/components/rank/topRank/RankListItemMain.tsx
+++ b/components/takgu/rank/topRank/RankListItemMain.tsx
@@ -2,10 +2,10 @@ import Link from 'next/link';
import React from 'react';
import { useRecoilValue } from 'recoil';
import { TbQuestionMark } from 'react-icons/tb';
-import { userImages } from 'types/rankTypes';
-import { colorToggleSelector } from 'utils/recoil/colorMode';
-import PlayerImage from 'components/PlayerImage';
-import styles from 'styles/rank/RankListMain.module.scss';
+import { userImages } from 'types/takgu/rankTypes';
+import { colorToggleSelector } from 'utils/recoil/takgu/colorMode';
+import PlayerImage from 'components/takgu/PlayerImage';
+import styles from 'styles/takgu/rank/RankListMain.module.scss';
interface RankListItemMainProps {
rank: number;
@@ -38,7 +38,7 @@ export default function RankListItemMain({
}`}
>
{renderLink ? (
-
+
{rank}
diff --git a/components/rank/topRank/RankListMain.tsx b/components/takgu/rank/topRank/RankListMain.tsx
similarity index 86%
rename from components/rank/topRank/RankListMain.tsx
rename to components/takgu/rank/topRank/RankListMain.tsx
index 4b3160d7d..40b624e46 100644
--- a/components/rank/topRank/RankListMain.tsx
+++ b/components/takgu/rank/topRank/RankListMain.tsx
@@ -1,10 +1,10 @@
import { useEffect, useMemo, useState } from 'react';
import { useRecoilValue } from 'recoil';
-import { userImages } from 'types/rankTypes';
-import { colorToggleSelector } from 'utils/recoil/colorMode';
-import RankListItemMain from 'components/rank/topRank/RankListItemMain';
-import useRankListMain from 'hooks/rank/useRankListMain';
-import styles from 'styles/rank/RankListMain.module.scss';
+import { userImages } from 'types/takgu/rankTypes';
+import { colorToggleSelector } from 'utils/recoil/takgu/colorMode';
+import RankListItemMain from 'components/takgu/rank/topRank/RankListItemMain';
+import useRankListMain from 'hooks/takgu/rank/useRankListMain';
+import styles from 'styles/takgu/rank/RankListMain.module.scss';
interface RankListMainProps {
isMain: boolean;
diff --git a/components/recruit/Application/ApplicationForm.tsx b/components/takgu/recruit/Application/ApplicationForm.tsx
similarity index 86%
rename from components/recruit/Application/ApplicationForm.tsx
rename to components/takgu/recruit/Application/ApplicationForm.tsx
index 8d69f0a30..589df5dbf 100644
--- a/components/recruit/Application/ApplicationForm.tsx
+++ b/components/takgu/recruit/Application/ApplicationForm.tsx
@@ -7,18 +7,18 @@ import {
IQuestionForm,
IRecruitmentDetail,
refMap,
-} from 'types/recruit/recruitments';
-import { applicationAnswerSet } from 'utils/handleApplicationForm';
+} from 'types/takgu/recruit/recruitments';
import {
applicationAlertState,
applicationModalState,
} from 'utils/recoil/application';
-import ApplyEditModal from 'components/modal/recruitment/ApplyEditModal';
-import CancelModal from 'components/modal/recruitment/CancelModal';
-import MultiCheckForm from 'components/recruit/Application/applicationFormItems/MultiCheckForm';
-import SingleCheckForm from 'components/recruit/Application/applicationFormItems/SingleCheckForm';
-import TextForm from 'components/recruit/Application/applicationFormItems/TextForm';
-import styles from 'styles/recruit/application.module.scss';
+import { applicationAnswerSet } from 'utils/takgu/handleApplicationForm';
+import ApplyEditModal from 'components/takgu/modal/recruitment/ApplyEditModal';
+import CancelModal from 'components/takgu/modal/recruitment/CancelModal';
+import MultiCheckForm from 'components/takgu/recruit/Application/applicationFormItems/MultiCheckForm';
+import SingleCheckForm from 'components/takgu/recruit/Application/applicationFormItems/SingleCheckForm';
+import TextForm from 'components/takgu/recruit/Application/applicationFormItems/TextForm';
+import styles from 'styles/takgu/recruit/application.module.scss';
interface IApplicationFormProps {
mode: ApplicationFormType;
diff --git a/components/recruit/Application/ApplicationLoadingNoData.tsx b/components/takgu/recruit/Application/ApplicationLoadingNoData.tsx
similarity index 92%
rename from components/recruit/Application/ApplicationLoadingNoData.tsx
rename to components/takgu/recruit/Application/ApplicationLoadingNoData.tsx
index 2ad27a0fe..d761e4eec 100644
--- a/components/recruit/Application/ApplicationLoadingNoData.tsx
+++ b/components/takgu/recruit/Application/ApplicationLoadingNoData.tsx
@@ -1,6 +1,6 @@
import { useRouter } from 'next/router';
import { Box, Grid, Paper, Button } from '@mui/material';
-import styles from 'styles/recruit/application.module.scss';
+import styles from 'styles/takgu/recruit/application.module.scss';
interface IApplicationLoadingNoData {
isLoading: boolean;
diff --git a/components/recruit/Application/ApplicationSnackBar.tsx b/components/takgu/recruit/Application/ApplicationSnackBar.tsx
similarity index 100%
rename from components/recruit/Application/ApplicationSnackBar.tsx
rename to components/takgu/recruit/Application/ApplicationSnackBar.tsx
diff --git a/components/recruit/Application/applicationFormItems/MultiCheckForm.tsx b/components/takgu/recruit/Application/applicationFormItems/MultiCheckForm.tsx
similarity index 91%
rename from components/recruit/Application/applicationFormItems/MultiCheckForm.tsx
rename to components/takgu/recruit/Application/applicationFormItems/MultiCheckForm.tsx
index ee31decf7..3b63bffea 100644
--- a/components/recruit/Application/applicationFormItems/MultiCheckForm.tsx
+++ b/components/takgu/recruit/Application/applicationFormItems/MultiCheckForm.tsx
@@ -9,8 +9,8 @@ import {
IApplicantAnswer,
ICheck,
IQuestionForm,
-} from 'types/recruit/recruitments';
-import styles from 'styles/recruit/application.module.scss';
+} from 'types/takgu/recruit/recruitments';
+import styles from 'styles/takgu/recruit/application.module.scss';
interface IitemProps {
form: IQuestionForm;
diff --git a/components/recruit/Application/applicationFormItems/SingleCheckForm.tsx b/components/takgu/recruit/Application/applicationFormItems/SingleCheckForm.tsx
similarity index 93%
rename from components/recruit/Application/applicationFormItems/SingleCheckForm.tsx
rename to components/takgu/recruit/Application/applicationFormItems/SingleCheckForm.tsx
index 2c2ff5bfd..0b3534536 100644
--- a/components/recruit/Application/applicationFormItems/SingleCheckForm.tsx
+++ b/components/takgu/recruit/Application/applicationFormItems/SingleCheckForm.tsx
@@ -10,8 +10,8 @@ import {
IApplicantAnswer,
ICheck,
IQuestionForm,
-} from 'types/recruit/recruitments';
-import styles from 'styles/recruit/application.module.scss';
+} from 'types/takgu/recruit/recruitments';
+import styles from 'styles/takgu/recruit/application.module.scss';
interface IitemProps {
form: IQuestionForm;
diff --git a/components/recruit/Application/applicationFormItems/TextForm.tsx b/components/takgu/recruit/Application/applicationFormItems/TextForm.tsx
similarity index 90%
rename from components/recruit/Application/applicationFormItems/TextForm.tsx
rename to components/takgu/recruit/Application/applicationFormItems/TextForm.tsx
index 52c42b135..896f6bcc7 100644
--- a/components/recruit/Application/applicationFormItems/TextForm.tsx
+++ b/components/takgu/recruit/Application/applicationFormItems/TextForm.tsx
@@ -4,8 +4,8 @@ import {
ApplicationFormType,
IApplicantAnswer,
IQuestionForm,
-} from 'types/recruit/recruitments';
-import styles from 'styles/recruit/application.module.scss';
+} from 'types/takgu/recruit/recruitments';
+import styles from 'styles/takgu/recruit/application.module.scss';
interface IitemProps {
form: IQuestionForm;
diff --git a/components/recruit/Application/applicationLayout/ApplicationFormFooter.tsx b/components/takgu/recruit/Application/applicationLayout/ApplicationFormFooter.tsx
similarity index 91%
rename from components/recruit/Application/applicationLayout/ApplicationFormFooter.tsx
rename to components/takgu/recruit/Application/applicationLayout/ApplicationFormFooter.tsx
index 3f24bb53c..8dda752fd 100644
--- a/components/recruit/Application/applicationLayout/ApplicationFormFooter.tsx
+++ b/components/takgu/recruit/Application/applicationLayout/ApplicationFormFooter.tsx
@@ -1,9 +1,9 @@
import { Dispatch, SetStateAction } from 'react';
import { useSetRecoilState } from 'recoil';
import { Button } from '@mui/material';
-import { ApplicationFormType } from 'types/recruit/recruitments';
+import { ApplicationFormType } from 'types/takgu/recruit/recruitments';
import { applicationModalState } from 'utils/recoil/application';
-import styles from 'styles/recruit/application.module.scss';
+import styles from 'styles/takgu/recruit/application.module.scss';
interface IApplicationFormFooterProps {
mode: ApplicationFormType;
diff --git a/components/recruit/Main/CollapseListItem.tsx b/components/takgu/recruit/Main/CollapseListItem.tsx
similarity index 92%
rename from components/recruit/Main/CollapseListItem.tsx
rename to components/takgu/recruit/Main/CollapseListItem.tsx
index 08f8a391e..d56e9181c 100644
--- a/components/recruit/Main/CollapseListItem.tsx
+++ b/components/takgu/recruit/Main/CollapseListItem.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import { KeyboardArrowDown } from '@mui/icons-material';
import { Collapse, ListItemButton, ListItemText } from '@mui/material';
-import style from 'styles/recruit/Main/collapseListItem.module.scss';
+import style from 'styles/takgu/recruit/Main/collapseListItem.module.scss';
function CollapseListItem({
title,
diff --git a/components/recruit/Main/MyApplicationInfo.tsx b/components/takgu/recruit/Main/MyApplicationInfo.tsx
similarity index 81%
rename from components/recruit/Main/MyApplicationInfo.tsx
rename to components/takgu/recruit/Main/MyApplicationInfo.tsx
index 4d111741c..b45629615 100644
--- a/components/recruit/Main/MyApplicationInfo.tsx
+++ b/components/takgu/recruit/Main/MyApplicationInfo.tsx
@@ -1,7 +1,7 @@
import { useRouter } from 'next/router';
import { Button, Stack } from '@mui/material';
-import { resultType } from 'types/recruit/recruitments';
-import style from 'styles/recruit/Main/myRecruitment.module.scss';
+import { resultType } from 'types/takgu/recruit/recruitments';
+import style from 'styles/takgu/recruit/Main/myRecruitment.module.scss';
const MyApplicationInfo = ({
status,
@@ -17,7 +17,7 @@ const MyApplicationInfo = ({
const onCheck = () => {
if (!applicationId) return;
router.push(
- `/recruit/my-application?recruitId=${recruitId}&applicationId=${applicationId}`
+ `/takgu/recruit/my-application?recruitId=${recruitId}&applicationId=${applicationId}`
);
};
diff --git a/components/recruit/Main/MyRecruitStatus.tsx b/components/takgu/recruit/Main/MyRecruitStatus.tsx
similarity index 83%
rename from components/recruit/Main/MyRecruitStatus.tsx
rename to components/takgu/recruit/Main/MyRecruitStatus.tsx
index faea0955d..0d39fd007 100644
--- a/components/recruit/Main/MyRecruitStatus.tsx
+++ b/components/takgu/recruit/Main/MyRecruitStatus.tsx
@@ -1,8 +1,8 @@
import { Stack } from '@mui/material';
-import { resultType } from 'types/recruit/recruitments';
+import { resultType } from 'types/takgu/recruit/recruitments';
import { dateToKRFullString } from 'utils/handleTime';
-import RecruitStepper from 'components/recruit/Main/RecruitStepper';
-import style from 'styles/recruit/Main/myRecruitment.module.scss';
+import RecruitStepper from 'components/takgu/recruit/Main/RecruitStepper';
+import style from 'styles/takgu/recruit/Main/myRecruitment.module.scss';
const MyRecruitStatus = ({
status,
diff --git a/components/recruit/Main/MyRecruitment.tsx b/components/takgu/recruit/Main/MyRecruitment.tsx
similarity index 69%
rename from components/recruit/Main/MyRecruitment.tsx
rename to components/takgu/recruit/Main/MyRecruitment.tsx
index ce1dd1e6c..a3d0c253b 100644
--- a/components/recruit/Main/MyRecruitment.tsx
+++ b/components/takgu/recruit/Main/MyRecruitment.tsx
@@ -1,11 +1,11 @@
import { useRouter } from 'next/router';
import { List } from '@mui/material';
-import CollapseListItem from 'components/recruit/Main/CollapseListItem';
-import MyApplicationInfo from 'components/recruit/Main/MyApplicationInfo';
-import MyRecruitStatus from 'components/recruit/Main/MyRecruitStatus';
-import useGetRecruitResult from 'hooks/recruit/useGetRecruitResult';
-import style from 'styles/recruit/Main/myRecruitment.module.scss';
-import textStyle from 'styles/recruit/text.module.scss';
+import CollapseListItem from 'components/takgu/recruit/Main/CollapseListItem';
+import MyApplicationInfo from 'components/takgu/recruit/Main/MyApplicationInfo';
+import MyRecruitStatus from 'components/takgu/recruit/Main/MyRecruitStatus';
+import useGetRecruitResult from 'hooks/takgu/recruit/useGetRecruitResult';
+import style from 'styles/takgu/recruit/Main/myRecruitment.module.scss';
+import textStyle from 'styles/takgu/recruit/text.module.scss';
const MyRecruitment = ({ applicationId }: { applicationId?: number }) => {
const router = useRouter();
diff --git a/components/recruit/Main/RecruitStepper.tsx b/components/takgu/recruit/Main/RecruitStepper.tsx
similarity index 94%
rename from components/recruit/Main/RecruitStepper.tsx
rename to components/takgu/recruit/Main/RecruitStepper.tsx
index 3d2ee9cff..197eaf603 100644
--- a/components/recruit/Main/RecruitStepper.tsx
+++ b/components/takgu/recruit/Main/RecruitStepper.tsx
@@ -13,8 +13,8 @@ import {
stepLabelClasses,
styled,
} from '@mui/material';
-import { resultType } from 'types/recruit/recruitments';
-import style from 'styles/recruit/Main/myRecruitment.module.scss';
+import { resultType } from 'types/takgu/recruit/recruitments';
+import style from 'styles/takgu/recruit/Main/myRecruitment.module.scss';
const RecruitStepper = ({ status }: { status: resultType }) => {
return (
diff --git a/components/recruit/RecruitLayout.tsx b/components/takgu/recruit/RecruitLayout.tsx
similarity index 94%
rename from components/recruit/RecruitLayout.tsx
rename to components/takgu/recruit/RecruitLayout.tsx
index 8b5216fc9..eb2495415 100644
--- a/components/recruit/RecruitLayout.tsx
+++ b/components/takgu/recruit/RecruitLayout.tsx
@@ -1,6 +1,6 @@
import { ThemeProvider, createTheme } from '@mui/material';
// import useAxiosWithToast from 'hooks/useAxiosWithToast';
-import styles from 'styles/recruit/layout.module.scss';
+import styles from 'styles/takgu/recruit/layout.module.scss';
import ApplicationSnackBar from './Application/ApplicationSnackBar';
type RecruitLayoutProps = {
diff --git a/components/recruit/RecruitList/RecruitListItem.tsx b/components/takgu/recruit/RecruitList/RecruitListItem.tsx
similarity index 75%
rename from components/recruit/RecruitList/RecruitListItem.tsx
rename to components/takgu/recruit/RecruitList/RecruitListItem.tsx
index 712d35674..307f05215 100644
--- a/components/recruit/RecruitList/RecruitListItem.tsx
+++ b/components/takgu/recruit/RecruitList/RecruitListItem.tsx
@@ -1,14 +1,16 @@
import { useRouter } from 'next/router';
import { ListItemButton, ListItemText } from '@mui/material';
-import { recruitment } from 'types/recruit/recruitments';
+import { recruitment } from 'types/takgu/recruit/recruitments';
import { dateToString } from 'utils/handleTime';
-import styles from 'styles/recruit/RecruitList/list.module.scss';
+import styles from 'styles/takgu/recruit/RecruitList/list.module.scss';
const RecruitListItem = ({ recruit }: { recruit: recruitment }) => {
const router = useRouter();
return (
router.push(`/recruit/detail/?recruitId=${recruit.id}`)}
+ onClick={() =>
+ router.push(`/takgu/recruit/detail/?recruitId=${recruit.id}`)
+ }
className={styles.listItem}
>
{
diff --git a/components/recruit/StickyHeader.tsx b/components/takgu/recruit/StickyHeader.tsx
similarity index 77%
rename from components/recruit/StickyHeader.tsx
rename to components/takgu/recruit/StickyHeader.tsx
index 164d976c2..52a00de62 100644
--- a/components/recruit/StickyHeader.tsx
+++ b/components/takgu/recruit/StickyHeader.tsx
@@ -1,19 +1,19 @@
import { usePathname, useRouter } from 'next/navigation';
import { HomeOutlined } from '@mui/icons-material';
import { Button } from '@mui/material';
-import commonStyle from 'styles/recruit/common.module.scss';
-import textStyle from 'styles/recruit/text.module.scss';
+import commonStyle from 'styles/takgu/recruit/common.module.scss';
+import textStyle from 'styles/takgu/recruit/text.module.scss';
const StickyHeader = ({ headerTitle }: { headerTitle: string }) => {
const router = useRouter();
const pathName = usePathname();
const goHome = () => {
- router.push('/recruit');
+ router.push('/takgu/recruit');
};
return (
{headerTitle}
- {pathName !== '/recruit' && (
+ {pathName !== '/takgu/recruit' && (