Merge pull request #104 from IT-Cotato/chore/folder-structure

[Chore] 폴더 생성 및 파일 재배치

src/components/Calendar/CalendarNolesson.tsx

@@ -4,7 +4,7 @@ import { MdKeyboardArrowRight } from 'react-icons/md';
 import { useNavigate, useParams } from 'react-router-dom';
 import student from '../../assets/images/student_girl.png';
 import { useState } from 'react';
-import Toast from '../Toast';
+import Toast from '../Modal/Toast';
 import { getShareCode } from '../../api/roomList.api';
 
 type Props = {

src/components/Header.tsx → src/components/Common/Header.tsx

@@ -2,9 +2,9 @@ import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import { GoArrowLeft } from 'react-icons/go';
 import { useEffect, useMemo, useState } from 'react';
 import { FiTrash2 } from 'react-icons/fi';
-import Modal from './Modal/Modal';
-import RoomDeleteModal from './Modal/RoomDeleteModal';
-import useDeleteStore from '../store/useDeleteStore';
+import Modal from '../Modal/Modal';
+import RoomDeleteModal from '../Modal/RoomDeleteModal';
+import useDeleteStore from '../../store/useDeleteStore';
 
 // 뒤로 가기 없는 페이지들
 const ROUTE_TITLES: { [key: string]: string } = {

src/components/NavBar.tsx → src/components/Common/NavBar.tsx

@@ -1,13 +1,13 @@
 import { useEffect, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
-import CalendarSvg from '../assets/images/calendar.svg?react';
-import CalendarFill from '../assets/images/calendarFill.svg?react';
-import HomeSvg from '../assets/images/home.svg?react';
-import HomeFill from '../assets/images/homeFill.svg?react';
-import MypageSvg from '../assets/images/mypage.svg?react';
-import MyPageFill from '../assets/images/mypageFill.svg?react';
-import Indicator from '../assets/images/Indicator.svg?react';
+import CalendarSvg from '../../assets/images/calendar.svg?react';
+import CalendarFill from '../../assets/images/calendarFill.svg?react';
+import HomeSvg from '../../assets/images/home.svg?react';
+import HomeFill from '../../assets/images/homeFill.svg?react';
+import MypageSvg from '../../assets/images/mypage.svg?react';
+import MyPageFill from '../../assets/images/mypageFill.svg?react';
+import Indicator from '../../assets/images/Indicator.svg?react';
 
 const NavBar = () => {
   const nav = useNavigate();

src/components/BottomSheet.tsx → src/components/Deposit/BottomSheet.tsx

@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react';
-import { getBankList } from '../api/deposit.api';
+import { getBankList } from '../../api/deposit.api';
 import Bank from './Bank';
-import { BankInfo } from '../models/deposit.model';
-import Loading from '../pages/Loading';
+import { BankInfo } from '../../models/deposit.model';
+import Loading from '../../pages/Common/Loading';
 
 interface BottomSheetProps {
   setBottomSheetOpen: (value: boolean) => void;

src/components/ChooseBank.tsx → src/components/Deposit/ChooseBank.tsx

@@ -1,8 +1,8 @@
 import { useState } from 'react';
 import { FaAngleDown } from 'react-icons/fa6';
 import BottomSheet from './BottomSheet';
-import Modal from './Modal/Modal';
-import { BankInfo } from '../models/deposit.model';
+import Modal from '../Modal/Modal';
+import { BankInfo } from '../../models/deposit.model';
 
 interface ChooseBankProps {
   setBank: (value: BankInfo) => void;

src/components/DepositDetail.tsx → src/components/Deposit/DepositDetail.tsx

@@ -1,7 +1,7 @@
 import { useNavigate } from 'react-router-dom';
-import Edit from '../assets/images/RoomDetail/Edit copy.svg?react';
-import { DepositInfo } from '../models/deposit.model';
-import { getClosestFutureDate } from '../utils/getCloseDate';
+import Edit from '../../assets/images/RoomDetail/Edit copy.svg?react';
+import { DepositInfo } from '../../models/deposit.model';
+import { getClosestFutureDate } from '../../utils/getCloseDate';
 
 interface DepositDetailProps {
   depositInfo: DepositInfo;

src/components/AddFile.tsx → src/components/Material/AddFile.tsx

@@ -1,5 +1,5 @@
 import { ChangeEvent, useState } from 'react';
-import AddIcon from '../assets/images/File_dock_add.svg?react';
+import AddIcon from '../../assets/images/File_dock_add.svg?react';
 import FileDetail from './FileDetail';
 
 interface AddFileProps {

src/components/FileDetail.tsx → src/components/Material/FileDetail.tsx

@@ -1,8 +1,8 @@
 import { FaRegFileAlt } from 'react-icons/fa';
-import vector_gray from '../assets/images/vector_gray.png';
+import vector_gray from '../../assets/images/vector_gray.png';
 import { RiDownloadLine } from 'react-icons/ri';
-import { getAllLectureFile } from '../api/materials.api';
-import { downloadFile } from '../utils/DownloadFiles';
+import { getAllLectureFile } from '../../api/materials.api';
+import { downloadFile } from '../../utils/DownloadFiles';
 import { useParams } from 'react-router-dom';
 import { FiTrash2 } from 'react-icons/fi';
 

src/components/Preview_1.tsx → src/components/Material/Preview_1.tsx

@@ -1,10 +1,10 @@
 import { FaRegFileAlt } from 'react-icons/fa';
-import vector_gray from '../assets/images/vector_gray.png';
+import vector_gray from '../../assets/images/vector_gray.png';
 import { RiDownloadLine } from 'react-icons/ri';
 import { MdKeyboardArrowRight } from 'react-icons/md';
 import { useNavigate, useParams } from 'react-router-dom';
-import { getAllLectureFile } from '../api/materials.api';
-import { downloadFile } from '../utils/DownloadFiles';
+import { getAllLectureFile } from '../../api/materials.api';
+import { downloadFile } from '../../utils/DownloadFiles';
 
 interface PreviewProps {
   type: string;

src/components/Preview_2.tsx → src/components/Material/Preview_2.tsx

@@ -1,7 +1,7 @@
-import vector_gray from '../assets/images/vector_gray.png';
+import vector_gray from '../../assets/images/vector_gray.png';
 import { MdKeyboardArrowRight } from 'react-icons/md';
 import { useNavigate } from 'react-router-dom';
-import Icon from '../assets/images/RoomDetail/homework.svg?react';
+import Icon from '../../assets/images/RoomDetail/homework.svg?react';
 
 interface PreviewProps {
   title: string;

src/components/Modal/CreateModal.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import Input from '../Room/Input';
+import Input from '../RoomDetail/Input';
 import { postGrade, postTest } from '../../api/statistics.api';
 import { useParams } from 'react-router-dom';
 import { patchMessage } from '../../api/mypage.api';

src/components/Modal/InviteModal.tsx

@@ -1,7 +1,7 @@
 import { useNavigate, useParams } from 'react-router-dom';
 import { getRoomInfo, postShareCode } from '../../api/roomList.api';
 import { useEffect, useState } from 'react';
-import RoomInfoContent from '../RoomInfoContent';
+import RoomInfoContent from '../Room/RoomInfoContent';
 import { SimpleRoomInfo } from '../../models/room.model';
 
 const InviteModal = () => {

src/components/Modal/ShareLinkModal.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { getShareCode } from '../../api/roomList.api';
-import Toast from '../Toast';
+import Toast from './Toast';
 import link from '../../assets/images/link.png';
 
 interface ShareLinkProps {

src/components/Toast.tsx → src/components/Modal/Toast.tsx

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import check from '../assets/images/check.png';
+import check from '../../assets/images/check.png';
 
 type ToastProps = {
   setToast: React.Dispatch<React.SetStateAction<boolean>>;

src/components/PermissionToggle.tsx → src/components/Room/PermissionToggle.tsx

@@ -1,4 +1,4 @@
-import { SimplePermission, Permission } from '../models/room.model';
+import { SimplePermission, Permission } from '../../models/room.model';
 
 type ToggleProps = {
   permission: Permission;

src/components/RoomEditor.tsx → src/components/Room/RoomEditor.tsx

@@ -1,13 +1,13 @@
-import SelectDate from '../components/SelectDate';
+import SelectDate from './SelectDate';
 import { useEffect, useState } from 'react';
-import { OnSubmit, SimpleLessonDay, SimplePermission, Room } from '../models/room.model';
-import { LessonDaysList } from '../utils/LessonDaysList';
-import { ParentPermission, StudentPermission } from '../utils/PermissionList';
+import { OnSubmit, SimpleLessonDay, SimplePermission, Room } from '../../models/room.model';
+import { LessonDaysList } from '../../utils/LessonDaysList';
+import { ParentPermission, StudentPermission } from '../../utils/PermissionList';
 import PermissionToggle from './PermissionToggle';
-import LongButton from './LongButton';
-import Modal from './Modal/Modal';
-import RoomDeleteModal from './Modal/RoomDeleteModal';
-import useDeleteStore from '../store/useDeleteStore';
+import LongButton from '../RoomDetail/LongButton';
+import Modal from '../Modal/Modal';
+import RoomDeleteModal from '../Modal/RoomDeleteModal';
+import useDeleteStore from '../../store/useDeleteStore';
 
 type EditProps = {
   currentRoom: Room | undefined;

src/components/RoomInfo.tsx → src/components/Room/RoomInfo.tsx

@@ -1,10 +1,10 @@
 import { FaAngleRight } from 'react-icons/fa6';
-import edit from '../assets/images/edit.png';
-import { SimpleRoomInfo } from '../models/room.model';
+import edit from '../../assets/images/edit.png';
+import { SimpleRoomInfo } from '../../models/room.model';
 import { useNavigate } from 'react-router-dom';
 import { useState } from 'react';
-import StudentEditModal from './Modal/StudentEditModal';
-import Modal from './Modal/Modal';
+import StudentEditModal from '../Modal/StudentEditModal';
+import Modal from '../Modal/Modal';
 import RoomInfoContent from './RoomInfoContent';
 
 type RoomProps = {

src/components/RoomInfoContent.tsx → src/components/Room/RoomInfoContent.tsx

@@ -1,13 +1,13 @@
-import { SimpleRoomInfo } from '../models/room.model';
+import { SimpleRoomInfo } from '../../models/room.model';
 import { useNavigate } from 'react-router-dom';
-import student_boy from '../assets/images/student_boy.png';
-import student_girl from '../assets/images/student_girl.png';
-import teacher_man from '../assets/images/teacher_man.png';
-import teacher_woman from '../assets/images/teacher_woman.png';
-import no_student from '../assets/images/no_student.png';
+import student_boy from '../../assets/images/student_boy.png';
+import student_girl from '../../assets/images/student_girl.png';
+import teacher_man from '../../assets/images/teacher_man.png';
+import teacher_woman from '../../assets/images/teacher_woman.png';
+import no_student from '../../assets/images/no_student.png';
 import { useEffect, useState } from 'react';
-import Modal from './Modal/Modal';
-import ProfileModal from './Modal/ProfileModal';
+import Modal from '../Modal/Modal';
+import ProfileModal from '../Modal/ProfileModal';
 
 type RoomProps = {
   room: SimpleRoomInfo;

src/components/SelectDate.tsx → src/components/Room/SelectDate.tsx

@@ -1,4 +1,4 @@
-import { LessonDay } from '../models/room.model';
+import { LessonDay } from '../../models/room.model';
 
 type LessonDayProps = {
   lessonDayItem: LessonDay;

src/components/Button.tsx → src/components/RoomDetail/Button.tsx

@@ -1,4 +1,4 @@
-import Add from '../assets/images/Add.svg?react';
+import Add from '../../assets/images/Add.svg?react';
 import { GrEdit } from 'react-icons/gr';
 
 interface ButtonProps {

src/components/DatePicker.tsx → src/components/RoomDetail/DatePicker.tsx

@@ -1,8 +1,8 @@
 import { useState } from 'react';
-import CalendarGrid from './Calendar/CalendarGrid';
-import DateHandler from './Calendar/DateHandler';
-import { Clicked } from '../models/calendar.model';
-import { formatDate } from '../utils/formatDate';
+import CalendarGrid from '../Calendar/CalendarGrid';
+import DateHandler from '../Calendar/DateHandler';
+import { Clicked } from '../../models/calendar.model';
+import { formatDate } from '../../utils/formatDate';
 
 interface DatePickerProps {
   setValue: (value: string) => void;

src/components/DetailButton.tsx → src/components/RoomDetail/DetailButton.tsx

@@ -1,12 +1,12 @@
 import { useNavigate } from 'react-router-dom';
 import clsx from 'clsx';
-import MaterialIcon from '../assets/images/RoomDetail/materials.svg?react';
-import HomeworklIcon from '../assets/images/RoomDetail/homework.svg?react';
-import StatisticsIcon from '../assets/images/RoomDetail/statistics.svg?react';
-import CounselingIcon from '../assets/images/RoomDetail/counseling.svg?react';
-import Modal from './Modal/Modal';
+import MaterialIcon from '../../assets/images/RoomDetail/materials.svg?react';
+import HomeworklIcon from '../../assets/images/RoomDetail/homework.svg?react';
+import StatisticsIcon from '../../assets/images/RoomDetail/statistics.svg?react';
+import CounselingIcon from '../../assets/images/RoomDetail/counseling.svg?react';
+import Modal from '../Modal/Modal';
 import { useState } from 'react';
-import AccessFail from './Modal/AccessFail';
+import AccessFail from '../Modal/AccessFail';
 
 interface DetailButtonProps {
   type: string;

src/components/Room/PickDate.tsx → src/components/RoomDetail/PickDate.tsx

@@ -1,7 +1,7 @@
 import Calendar from '../../assets/images/calendarGray.svg?react';
 import { MdKeyboardArrowRight } from 'react-icons/md';
 import Modal from '../Modal/Modal';
-import DatePicker from '../DatePicker';
+import DatePicker from './DatePicker';
 import { useState } from 'react';
 
 interface PickDateProps {

src/components/SearchBar.tsx → src/components/RoomDetail/SearchBar.tsx

@@ -1,8 +1,8 @@
 import { useState } from 'react';
-import Calendar from '../assets/images/calendarGray.svg?react';
-import Search from '../assets/images/Search.svg?react';
+import Calendar from '../../assets/images/calendarGray.svg?react';
+import Search from '../../assets/images/Search.svg?react';
 import './SearchBar.css';
-import Modal from './Modal/Modal';
+import Modal from '../Modal/Modal';
 import DatePicker from './DatePicker';
 
 interface SearchBarProps {

src/components/KakaoLoginButton.tsx → src/components/Signup/KakaoLoginButton.tsx

@@ -1,4 +1,4 @@
-import kakao_logo from '../assets/images/Kakao_logo.png';
+import kakao_logo from '../../assets/images/Kakao_logo.png';
 
 const KakaoLoginButton = () => {
   const REST_API_KEY = import.meta.env.VITE_KAKAO_REST_API;

src/components/KakaoOauth.tsx → src/components/Signup/KakaoOauth.tsx

@@ -1,9 +1,9 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { postAuthCode } from '../api/auth.api';
-import { UserCode } from '../models/user.model';
+import { postAuthCode } from '../../api/auth.api';
+import { UserCode } from '../../models/user.model';
 import { jwtDecode, JwtPayload } from 'jwt-decode';
-import Loading from '../pages/Loading';
+import Loading from '../../pages/Common/Loading';
 
 const KakaoOauth = () => {
   const navigate = useNavigate();

src/components/RoleSelectionButton.tsx → src/components/Signup/RoleSelectionButton.tsx

@@ -1,4 +1,4 @@
-import { Role } from '../utils/RoleList';
+import { Role } from '../../utils/RoleList';
 import { FaRegCheckCircle } from 'react-icons/fa';
 import { FaCheckCircle } from 'react-icons/fa';
 

src/components/Chart.tsx → src/components/Statistics/Chart.tsx

@@ -1,7 +1,6 @@
-import React, { useState, useEffect } from 'react';
-import { ComposedChart, Line, Bar, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer, Cell } from 'recharts';
-import Loading from '../pages/Loading';
-import { DataType } from '../pages/Statistics/Statistics';
+import { useState } from 'react';
+import { ComposedChart, Line, Bar, XAxis, YAxis, CartesianGrid, ResponsiveContainer, Cell } from 'recharts';
+import { DataType } from '../../pages/Statistics/Statistics';
 import NoStatsData from './NoStatsData';
 
 interface ChartProps {

src/components/Statistics/Empty.tsx

@@ -1,5 +1,5 @@
 import Frame from '../../assets/images/Frame.svg?react';
-import StatisticsButton from '../StatisticsButton';
+import StatisticsButton from './StatisticsButton';
 
 interface EmptyProps {
   setModalOpen: (value: boolean) => void;

src/components/NoStatsData.tsx → src/components/Statistics/NoStatsData.tsx

@@ -1,4 +1,4 @@
-import Question from '../assets/images/Question.svg?react';
+import Question from '../../assets/images/Question.svg?react';
 
 interface ModalProps {
   onClose?: () => void;

src/components/Table.tsx → src/components/Statistics/Table.tsx

@@ -2,10 +2,10 @@ import { createColumnHelper, flexRender, getCoreRowModel, useReactTable } from '
 import { IoMdAdd } from 'react-icons/io';
 import { FiTrash2 } from 'react-icons/fi';
 import { useEffect, useState } from 'react';
-import RoomDeleteModal from './Modal/RoomDeleteModal';
-import Modal from './Modal/Modal';
-import CreateModal from './Modal/CreateModal';
-import { getGrade } from '../api/statistics.api';
+import RoomDeleteModal from '../Modal/RoomDeleteModal';
+import Modal from '../Modal/Modal';
+import CreateModal from '../Modal/CreateModal';
+import { getGrade } from '../../api/statistics.api';
 import { useParams } from 'react-router-dom';
 
 type Grade = { round: number; title: string; grade: number; icon: React.ElementType };

src/pages/Calendar.tsx → src/pages/Calendar/Calendar.tsx

@@ -1,10 +1,10 @@
 import { useEffect, useState } from 'react';
-import { hasLesson, hasDeposit } from '../utils/CalendarUtils';
-import { getCalendar } from '../api/calendar.api';
-import CalendarInfo from '../components/Calendar/CalendarInfo';
-import { Cal, Clicked } from '../models/calendar.model';
-import DateHandler from '../components/Calendar/DateHandler';
-import CalendarGrid from '../components/Calendar/CalendarGrid';
+import { hasLesson, hasDeposit } from '../../utils/CalendarUtils';
+import { getCalendar } from '../../api/calendar.api';
+import CalendarInfo from '../../components/Calendar/CalendarInfo';
+import { Cal, Clicked } from '../../models/calendar.model';
+import DateHandler from '../../components/Calendar/DateHandler';
+import CalendarGrid from '../../components/Calendar/CalendarGrid';
 
 const Calendar = () => {
   const [date, setDate] = useState(new Date());

src/pages/Loading.tsx → src/pages/Common/Loading.tsx

@@ -1,4 +1,4 @@
-import loading_logo from '../assets/images/loading_logo.png';
+import loading_logo from '../../assets/images/loading_logo.png';
 
 interface LoadingProps {
   text: string;

src/pages/Splash.tsx → src/pages/Common/Splash.tsx

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
-import mainlogo from '../assets/images/mainlogo.png';
+import mainlogo from '../../assets/images/mainlogo.png';
 
 const Splash = () => {
   const navigate = useNavigate();

src/pages/Counseling/CounselingDetail.tsx

@@ -3,9 +3,9 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { CounselingLogDetail } from '../../models/counseling.model';
 import { deleteCounselingLog, getCounselingLogDetail } from '../../api/counseling.api';
 import Edit from '../../assets/images/RoomDetail/Edit.svg?react';
-import ChooseButton from '../../components/Room/ChooseButton';
-import TextArea from '../../components/Room/TextArea';
-import Loading from '../Loading';
+import ChooseButton from '../../components/Counseling/ChooseButton';
+import TextArea from '../../components/RoomDetail/TextArea';
+import Loading from '../Common/Loading';
 import useDeleteStore from '../../store/useDeleteStore';
 import Modal from '../../components/Modal/Modal';
 import RoomDeleteModal from '../../components/Modal/RoomDeleteModal';