Skip to content

Commit

Permalink
Merge pull request #231 from Meetfolio-Project-CodeZ-Team/develop
Browse files Browse the repository at this point in the history
merge to main
  • Loading branch information
Minkyu0424 authored Jun 2, 2024
2 parents f204b35 + b475e90 commit 6933d15
Show file tree
Hide file tree
Showing 92 changed files with 250 additions and 1,125 deletions.
2 changes: 0 additions & 2 deletions src/app/(route)/admin/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use client'
import AdminNavContainer from '@/app/components/admin/containers/AdminNavContainer'
import DashboardContainer from '@/app/components/admin/containers/DashboardContainer'
import Footer from '@/app/components/layout/Footer'
import Header from '@/app/components/layout/Header'
import { useEffect, useState } from 'react'

export default function AdminPage() {
return (
Expand Down
7 changes: 2 additions & 5 deletions src/app/(route)/board/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ import BoardContainer from '@/app/components/board/containers/BoardContainer'
import BoardDetailContainer from '@/app/components/board/containers/BoardDetailContainer'
import Footer from '@/app/components/layout/Footer'
import Header from '@/app/components/layout/Header'
import { boardDataState, selectedPostId } from '@/app/recoil/board'
import { selectedPostId } from '@/app/recoil/board'
import { useEffect, useState } from 'react'
import { useRecoilState, useResetRecoilState } from 'recoil'
import { useResetRecoilState } from 'recoil'

export default function JobBoardPage() {
const [data, setData] = useState<ResponseEmploymentAll | null>(null)
const [boardData, setBoardData] = useRecoilState(boardDataState)
const resetId = useResetRecoilState(selectedPostId)

useEffect(() => {
Expand All @@ -19,8 +18,6 @@ export default function JobBoardPage() {
`${process.env.NEXT_PUBLIC_NEXT_SERVER}/api/board/employment?page=0`,
)
const resData = await response.json()

setBoardData(resData.result)
setData(resData.result)
}
fetchData()
Expand Down
1 change: 0 additions & 1 deletion src/app/(route)/board/post/employment/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default function PostEmploymentPage() {
)
const resData = await response.json()
setUser(resData.result)
console.log(resData)
}
getUser()
}, [nickname])
Expand Down
1 change: 0 additions & 1 deletion src/app/(route)/board/post/group/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default function PostGroupPage() {
)
const resData = await response.json()
setUser(resData.result)
console.log(resData)
}
getUser()
}, [nickname])
Expand Down
1 change: 0 additions & 1 deletion src/app/(route)/board/update/employment/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default function PatchEmploymentPage() {
)
const resData = await response.json()
setUser(resData.result)
console.log(resData)
}
getUser()
}, [id])
Expand Down
1 change: 0 additions & 1 deletion src/app/(route)/board/update/group/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default function PatchGroupPage() {
)
const resData = await response.json()
setUser(resData.result)
console.log(resData)
}
getUser()
}, [id])
Expand Down
1 change: 0 additions & 1 deletion src/app/(route)/coverletter/feedback/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export default function CovletFeedbackPage() {
)
const resData = await response.json()
setUser(resData.result)
console.log(resData)
}

fetchData()
Expand Down
7 changes: 6 additions & 1 deletion src/app/(route)/edit-coverletter/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import CovletMain from '@/app/components/coverletter/CovletMain'
import CovletSave from '@/app/components/coverletter/CovletSave'
import Footer from '@/app/components/layout/Footer'
import Header from '@/app/components/layout/Header'
import { analysisData, covletData, covletNum, feedbackData } from '@/app/recoil/coverletter'
import {
analysisData,
covletData,
covletNum,
feedbackData,
} from '@/app/recoil/coverletter'
import { useRouter } from 'next/navigation'
import { useEffect, useState } from 'react'
import { useRecoilState } from 'recoil'
Expand Down
14 changes: 7 additions & 7 deletions src/app/(route)/error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ export default function ErrorPage({
}) {
const [userInfo, setUser] = useState<memberInfo | null>(null)
const router = useRouter()
useEffect(() => {
document.cookie =
'accessToken=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;'
document.cookie =
'refreshToken=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;'
router.push('/login')
}, [error])
// useEffect(() => {
// document.cookie =
// 'accessToken=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;'
// document.cookie =
// 'refreshToken=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;'
// router.push('/login')
// }, [error])

useEffect(() => {
const fetchData = async () => {
Expand Down
15 changes: 0 additions & 15 deletions src/app/(route)/mypage/myCovletDetail/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ const MyCovletDetailPage = ({ params }: { params: { id: string } }) => {
})
}
if (data && data.result && data.result.feedbackInfo) {

setFeedBackData(data.result.feedbackInfo)
}
if (data && data.result && data.result.analysisInfo) {
Expand Down Expand Up @@ -150,17 +149,3 @@ const MyCovletDetailPage = ({ params }: { params: { id: string } }) => {
)
}
export default MyCovletDetailPage
const transKeyword = (keyword: string) => {
switch (keyword) {
case '백엔드':
return 'BACKEND'
case 'AI':
return 'AI'
case '웹개발':
return 'WEB'
case '앱개발':
return 'APP'
case '디자인':
return 'DESIGN'
}
}
2 changes: 0 additions & 2 deletions src/app/(route)/signup/complete/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client'

import Footer from '@/app/components/layout/Footer'
import Header from '@/app/components/layout/Header'
import Completed from '@/app/components/signup/Complete'
Expand Down
2 changes: 0 additions & 2 deletions src/app/(route)/signup/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client'

import Footer from '@/app/components/layout/Footer'
import Header from '@/app/components/layout/Header'
import SignupContainer from '@/app/components/signup/containers/SignupContainer'
Expand Down
Loading

0 comments on commit 6933d15

Please sign in to comment.