Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/UI/AdminPagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ const AdminPagination: React.FC<PaginationProps> = ({ currentPage, totalPages, s
)
}

export default AdminPagination
export default AdminPagination
2 changes: 1 addition & 1 deletion src/components/UI/FAQ_Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ const FAQSection: React.FC = () => {
)
}

export default FAQSection
export default FAQSection
21 changes: 13 additions & 8 deletions src/components/UI/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { JSX, useState, useEffect, use } from 'react'
import MobileLayout from '../layout/MobileLayout'
import React, { JSX, useState, useEffect } from 'react'
import headerMenu from '../../assets/images/headerMenu.svg'
import headerMenuUndo from '../../assets/images/headerMenuUndo.svg'
import { useNavigate } from 'react-router-dom'
Expand Down Expand Up @@ -66,7 +65,8 @@ export const Header = (): JSX.Element => {
<ul className='flex flex-col items-center space-y-6 text-center'>
<li
className='font-pretendardBlack text-mainColor text-[20px] cursor-pointer hover:text-white'
onClick={() => {console.log('About 이동')
onClick={() => {
// console.log('About 이동')
navigate('/')
toggleMenu()
}}
Expand All @@ -75,7 +75,8 @@ export const Header = (): JSX.Element => {
</li>
<li
className='font-pretendardBlack text-mainColor text-[20px] cursor-pointer hover:text-white'
onClick={() => {console.log('News 이동')
onClick={() => {
// console.log('News 이동')
navigate('/news')
toggleMenu()
}}
Expand All @@ -84,7 +85,8 @@ export const Header = (): JSX.Element => {
</li>
<li
className='font-pretendardBlack text-mainColor text-[20px] cursor-pointer hover:text-white'
onClick={() =>{console.log('Members 이동')
onClick={() =>{
// console.log('Members 이동')
navigate('/coremember')
toggleMenu()
}}
Expand All @@ -93,7 +95,8 @@ export const Header = (): JSX.Element => {
</li>
<li
className='font-pretendardBlack text-mainColor text-[20px] cursor-pointer hover:text-white'
onClick={() => {console.log('FAQ 이동')
onClick={() => {
// console.log('FAQ 이동')
navigate('/faq')
toggleMenu()
}}
Expand All @@ -102,7 +105,8 @@ export const Header = (): JSX.Element => {
</li>
<li
className='font-pretendardBlack text-white text-[20px] cursor-pointer hover:scale-110'
onClick={() => {console.log('form 이동')
onClick={() => {
// console.log('form 이동')
navigate('/recruit')
toggleMenu()
}}
Expand All @@ -111,7 +115,8 @@ export const Header = (): JSX.Element => {
</li>
<li
className='font-pretendardBlack text-white text-[20px] cursor-pointer hover:scale-110'
onClick={() => {console.log('합격여부 이동')
onClick={() => {
// console.log('합격여부 이동')
navigate('/recruit/result')
toggleMenu()
}}
Expand Down
2 changes: 1 addition & 1 deletion src/components/UI/MeetingDate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ const MeetingDate = ({ date, onClick, isSelected }: props): JSX.Element => {
)
}

export default MeetingDate
export default MeetingDate
2 changes: 1 addition & 1 deletion src/components/UI/MeetingDateSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ const MeetingDateSelector = ({ onSelect, period }: props): JSX.Element => {
)
}

export default MeetingDateSelector
export default MeetingDateSelector
2 changes: 1 addition & 1 deletion src/components/UI/MeetingTime.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ const MeetingTime = ({ time, onClick, isSelected, disabled }: props): JSX.Elemen
)
}

export default MeetingTime
export default MeetingTime
2 changes: 1 addition & 1 deletion src/components/UI/MeetingTimeSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ const MeetingTimeSelector = ({ onSelect, time, disabledSelectTime, slotsForDate
)
}

export default MeetingTimeSelector
export default MeetingTimeSelector
2 changes: 1 addition & 1 deletion src/components/UI/NewsContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ const NewsContent: React.FC<NewsProps> = React.memo(
}
)

export default NewsContent
export default NewsContent
2 changes: 1 addition & 1 deletion src/components/UI/NewsNotice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ const NewsNotice = ({ text }: notice): JSX.Element => {
)
}

export default NewsNotice
export default NewsNotice
2 changes: 1 addition & 1 deletion src/components/UI/NewsTextEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ const NewsTextEditor: React.FC<TextEditorProps> = ({ title, content, setTitle, s
)
}

export default NewsTextEditor
export default NewsTextEditor
5 changes: 2 additions & 3 deletions src/components/UI/RecruitUI.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const RecruitUI: React.FC = () => {

<div className="mt-2 pl-2 flex items-center">
<p className="text-mainColor font-pretendardSemiBold">🌿 신청 조건 :</p>
<span className="text-white pl-1 ">컴퓨터소프트웨어공학과 학생</span>
<span className="text-white pl-1 ">컴퓨터공학부 학생</span>
</div>

<div className="mt-2 pl-2">
Expand All @@ -101,7 +101,6 @@ export const RecruitUI: React.FC = () => {
)
}


export const RecruitUI_SUB: React.FC<RecruitUIProps> = ({ name }) => {
return (
<div className="whitespace-pre-line text-white flex flex-col items-start w-auto h-[auto] shadow-[0px_2px_3px_rgba(255,255,255,0.2)] bg-#17171B] gap-2 mx-2 font-pretendardRegular pl-2 text-[12px] ">
Expand Down Expand Up @@ -189,4 +188,4 @@ export const RecruitUI_FINAL2: React.FC<RecruitUIProps> = ({ name }) => {
</p>
</div>
)
}
}
6 changes: 1 addition & 5 deletions src/components/UI/Recruit_Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,4 @@ export const Button: React.FC<ButtonProps> = ({ text, className, onClick, disabl
</button>
</div>
)
}




}
2 changes: 1 addition & 1 deletion src/components/UI/Recruit_InputField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ export const InputField: React.FC<InputFieldProps> = ({
)}
</div>
)
}
}
12 changes: 4 additions & 8 deletions src/pages/News.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useEffect, useState, useRef, useMemo } from 'react'
import axios from 'axios'
import MobileLayout from '../components/layout/MobileLayout'
import dasomLogo from '../assets/images/dasomLogo.svg'
import NewsContent from '../components/UI/NewsContent'
Expand Down Expand Up @@ -30,13 +31,8 @@ const News: React.FC = () => {
return
}

const response = await fetch('https://dmu-dasom-api.or.kr/api/news')
if (!response.ok) {
throw new Error(`API 오류: ${response.status}`)
}
const data: NewsItem[] = await response.json()
//console.log('API 응답 데이터:', data)

const response = await axios.get('https://dmu-dasom-api.or.kr/api/news')
const data: NewsItem[] = response.data

const sortedData = data.map(item => ({
...item,
Expand Down Expand Up @@ -92,4 +88,4 @@ const News: React.FC = () => {
)
}

export default News
export default News
13 changes: 6 additions & 7 deletions src/pages/NewsInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useEffect, useState, useMemo, useRef } from 'react'
import axios from 'axios'
import { useParams, useNavigate } from 'react-router-dom'
import MobileLayout from '../components/layout/MobileLayout'
import dasomLogo from '../assets/images/dasomLogo.svg'
Expand All @@ -14,7 +15,7 @@ interface NewsDetail {
}

const NewsInfo: React.FC = () => {
const { no } = useParams<{ no: string }>() //
const { no } = useParams<{ no: string }>()
const [news, setNews] = useState<NewsDetail | null>(() => {
const savedNews = sessionStorage.getItem(`news-${no}`)
return savedNews ? JSON.parse(savedNews) : null
Expand All @@ -30,11 +31,9 @@ const NewsInfo: React.FC = () => {

const fetchNewsDetail = async () => {
try {
const response = await fetch(`https://dmu-dasom-api.or.kr/api/news/${no}`)
if (!response.ok) throw new Error('데이터를 불러오지 못했습니다.')
const data: NewsDetail = await response.json()
//console.log('API 응답:', data)

const response = await axios.get(`https://dmu-dasom-api.or.kr/api/news/${no}`)
const data: NewsDetail = response.data

setNews(data)
sessionStorage.setItem(`news-${no}`, JSON.stringify(data))
} catch (error) {
Expand Down Expand Up @@ -85,4 +84,4 @@ const NewsInfo: React.FC = () => {
)
}

export default React.memo(NewsInfo)
export default React.memo(NewsInfo)
Loading