diff --git a/README.md b/README.md index 27179ee..0382021 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,19 @@ # 코드잇 스프린트 13기 3팀(파트 2) -> 개발기간: 2025.01.24 ~ + +> 개발기간: 2025.01.24 ~ ## Contributors - +
- - + + - - - - -
팀원역할팀원역할
+ 노현지

노현지

@@ -26,7 +27,7 @@
+ 박재현

박재현

@@ -41,7 +42,7 @@
+ 신주하

신주하

@@ -53,7 +54,7 @@
+ 윤효준

윤효준

@@ -67,7 +68,7 @@
+ 임지혜

임지혜

@@ -137,34 +138,42 @@ feat : #27/Component Base - Button 기능 개발 ``` ## 기술 스택 + #### Environment + ![Visual Studio Code](https://img.shields.io/badge/Visual%20Studio%20Code-0078d7.svg?style=for-the-badge&logo=visual-studio-code&logoColor=white) ![Git](https://img.shields.io/badge/git-%23F05033.svg?style=for-the-badge&logo=git&logoColor=white) ![GitHub](https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white) #### Config + ![NPM](https://img.shields.io/badge/NPM-%23CB3837.svg?style=for-the-badge&logo=npm&logoColor=white) ![Vite](https://img.shields.io/badge/vite-%23646CFF.svg?style=for-the-badge&logo=vite&logoColor=white) #### Linters + ![js](https://img.shields.io/badge/eslint-3A33D1?style=for-the-badge&logo=eslint&logoColor=white) ![js](https://img.shields.io/badge/prettier-1A2C34?style=for-the-badge&logo=prettier&logoColor=F7BA3E) #### Development + ![JavaScript](https://img.shields.io/badge/javascript-%23323330.svg?style=for-the-badge&logo=javascript&logoColor=%23F7DF1E) ![React](https://img.shields.io/badge/react-%2320232a.svg?style=for-the-badge&logo=react&logoColor=%2361DAFB) ![TailwindCSS](https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white) #### communication + ![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white) ![Notion](https://img.shields.io/badge/Notion-%23000000.svg?style=for-the-badge&logo=notion&logoColor=white) #### Deployment + ![Vercel](https://img.shields.io/badge/vercel-%23000000.svg?style=for-the-badge&logo=vercel&logoColor=white) ## 설치 및 실행 방법 ### 로컬 실행 + ``` git clone https://github.com/yoonc01/Fandom-K.git cd Fandom-K @@ -173,27 +182,38 @@ npm run dev ``` ### 배포 주소 + 🚀 프로젝트를 확인하려면 [여기](https://fandom-k-murex.vercel.app/)를 클릭하세요! ## 프로젝트 구조 ``` 📦 src -├──── apis # API 관련 함수 및 관리 파일 +├──── apis # API 관련 함수 및 관리 파일 │ -├──── assets # 이미지 및 정적 파일 관리 -│ ├── icons # 아이콘 관련 파일 +├──── assets # 이미지 및 정적 파일 관리 +│ ├── icons # 아이콘 관련 파일 │ │ -│ └── images # 일반 이미지 파일 +│ └── images # 일반 이미지 파일 │ -├──── components # 공통 컴포넌트 관리 +├──── components # 공통 컴포넌트 관리 +│ │ +│ └── modalContent # 모달창 내용 관리 │ -├──── utils # 유틸리티 함수 관리 +├──── utils # 유틸리티 함수 관리 │ -└──── pages # 라우터 페이지 관리 - ├── landingPage # 랜딩 페이지 관련 파일 +└──── pages # 라우터 페이지 관리 + ├── landingPage # 랜딩 페이지 관련 파일 + │ + ├── listPage # 리스트 페이지 관련 파일 + │ ├── credit # credit 관련 파일 + │ │ + │ ├── donation # donation 관련 파일 + │ │ + │ └── monthlyChart # monthlyChart 관련 파일 │ - ├── listPage # 리스트 페이지 관련 파일 + ├── myPage # myPage 관련 파일 │ - └── myPage # 마이페이지 관련 파일 + └── notFoundPage # 404 에러 페이지 관련 파일 + ``` diff --git a/src/pages/listPage/CreditRechargeSuccess.jsx b/src/components/modalContent/CreditRechargeSuccess.jsx similarity index 100% rename from src/pages/listPage/CreditRechargeSuccess.jsx rename to src/components/modalContent/CreditRechargeSuccess.jsx diff --git a/src/pages/listPage/CreditShortageModalContent.jsx b/src/components/modalContent/CreditShortageModalContent.jsx similarity index 100% rename from src/pages/listPage/CreditShortageModalContent.jsx rename to src/components/modalContent/CreditShortageModalContent.jsx diff --git a/src/pages/listPage/DonationModalContent.jsx b/src/components/modalContent/DonationModalContent.jsx similarity index 100% rename from src/pages/listPage/DonationModalContent.jsx rename to src/components/modalContent/DonationModalContent.jsx diff --git a/src/pages/listPage/DonationSuccess.jsx b/src/components/modalContent/DonationSuccess.jsx similarity index 100% rename from src/pages/listPage/DonationSuccess.jsx rename to src/components/modalContent/DonationSuccess.jsx diff --git a/src/pages/listPage/RechargeModalContent.jsx b/src/components/modalContent/RechargeModalContent.jsx similarity index 100% rename from src/pages/listPage/RechargeModalContent.jsx rename to src/components/modalContent/RechargeModalContent.jsx diff --git a/src/pages/listPage/ListPage.jsx b/src/pages/listPage/ListPage.jsx index 3d2d743..51443bb 100644 --- a/src/pages/listPage/ListPage.jsx +++ b/src/pages/listPage/ListPage.jsx @@ -1,16 +1,16 @@ import { useEffect, useState } from 'react'; import Modal from '@/components/Modal'; import Header from '@/components/Header'; -import CreditSection from '@/pages/listPage/CreditSection'; +import CreditSection from '@/pages/listPage/credit/CreditSection'; import { getCredits } from '@/utils/creditStorage'; -import RechargeModalContent from '@/pages/listPage/RechargeModalContent'; -import CreditRechargeSuccess from '@/pages/listPage/CreditRechargeSuccess'; -import CreditShortageModalContent from '@/pages/listPage/CreditShortageModalContent'; -import DonationsList from '@/pages/listPage/DonationsList'; -import DonationModalContent from '@/pages/listPage/DonationModalContent'; +import RechargeModalContent from '@/components/modalContent/RechargeModalContent'; +import CreditRechargeSuccess from '@/components/modalContent/CreditRechargeSuccess'; +import CreditShortageModalContent from '@/components/modalContent/CreditShortageModalContent'; +import DonationsList from '@/pages/listPage/donation/DonationsList'; +import DonationModalContent from '@/components/modalContent/DonationModalContent'; import leftTopGradient from '@/assets/images/leftTopGradient.png'; -import DonationSuccess from './DonationSuccess'; -import MonthlyChartSection from './MonthlyChartSection'; +import DonationSuccess from '@/components/modalContent/DonationSuccess'; +import MonthlyChartSection from '@/pages/listPage/monthlyChart/MonthlyChartSection'; function ListPage() { const [isModalOpen, setIsModalOpen] = useState(false); diff --git a/src/pages/listPage/CreditSection.jsx b/src/pages/listPage/credit/CreditSection.jsx similarity index 100% rename from src/pages/listPage/CreditSection.jsx rename to src/pages/listPage/credit/CreditSection.jsx diff --git a/src/pages/listPage/DonationCard.jsx b/src/pages/listPage/donation/DonationCard.jsx similarity index 100% rename from src/pages/listPage/DonationCard.jsx rename to src/pages/listPage/donation/DonationCard.jsx diff --git a/src/pages/listPage/DonationsList.jsx b/src/pages/listPage/donation/DonationsList.jsx similarity index 98% rename from src/pages/listPage/DonationsList.jsx rename to src/pages/listPage/donation/DonationsList.jsx index 45c400b..5b95c50 100644 --- a/src/pages/listPage/DonationsList.jsx +++ b/src/pages/listPage/donation/DonationsList.jsx @@ -1,6 +1,6 @@ import { useEffect, useState, useRef } from 'react'; import { getItems } from '@/apis/donationApi'; -import DonationCard from '@/pages/listPage/DonationCard'; +import DonationCard from '@/pages/listPage/donation/DonationCard'; import prevIcon from '@/assets/icons/prevIcon.svg'; import nextIcon from '@/assets/icons/nextIcon.svg'; diff --git a/src/pages/listPage/MonthlyChartItem.jsx b/src/pages/listPage/monthlyChart/MonthlyChartItem.jsx similarity index 100% rename from src/pages/listPage/MonthlyChartItem.jsx rename to src/pages/listPage/monthlyChart/MonthlyChartItem.jsx diff --git a/src/pages/listPage/MonthlyChartList.jsx b/src/pages/listPage/monthlyChart/MonthlyChartList.jsx similarity index 86% rename from src/pages/listPage/MonthlyChartList.jsx rename to src/pages/listPage/monthlyChart/MonthlyChartList.jsx index edda8b7..2fe7384 100644 --- a/src/pages/listPage/MonthlyChartList.jsx +++ b/src/pages/listPage/monthlyChart/MonthlyChartList.jsx @@ -1,5 +1,4 @@ -import { useEffect } from 'react'; -import MonthlyChartItem from './MonthlyChartItem'; +import MonthlyChartItem from '@/pages/listPage/monthlyChart/MonthlyChartItem'; const MonthlyChartList = ({ idols }) => { if (!idols.length === 0) { diff --git a/src/pages/listPage/MonthlyChartSection.jsx b/src/pages/listPage/monthlyChart/MonthlyChartSection.jsx similarity index 97% rename from src/pages/listPage/MonthlyChartSection.jsx rename to src/pages/listPage/monthlyChart/MonthlyChartSection.jsx index dd6f8cb..4ddd23d 100644 --- a/src/pages/listPage/MonthlyChartSection.jsx +++ b/src/pages/listPage/monthlyChart/MonthlyChartSection.jsx @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'; import chartLogo from '@/assets/icons/chartLogo.svg'; import { getLists } from '@/apis/idolListApi'; import PrimaryButton from '@/components/PrimaryButton'; -import MonthlyChartList from './MonthlyChartList'; +import MonthlyChartList from '@/pages/listPage/monthlyChart/MonthlyChartList'; const MonthlyChartSection = () => { const [gender, setGender] = useState('female');