Merge pull request #2 from Original-Gimchi/refactor/code-review

FIX : children 컴포넌트 공급 오류 수정
Team-INSERT · Mar 26, 2023 · ac07631 · ac07631
2 parents fd7c59c + bfb2640
commit ac07631
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 48 deletions.
diff --git a/pages/404.tsx b/pages/404.tsx
@@ -1,8 +1,8 @@
-import * as C from '@/components'
 import * as S from '../layout/index.style'
 
 import React from 'react'
-import { NextSeoProps } from 'next-seo'
+import { NextSeo, NextSeoProps } from 'next-seo'
+import { Aside, Board, ScrollBtn } from '@/components'
 
 const NotFound = () => {
 	const seoConfig: NextSeoProps = {
@@ -22,14 +22,14 @@ const NotFound = () => {
 
 	return (
 		<>
-			<C.Header />
+			<NextSeo {...seoConfig} />
 			<S.NotFoundWrap>
-				<C.Board>
+				<Board>
 					<S.NotFound>404 Not Found</S.NotFound>
-				</C.Board>
-				<C.Aside />
+				</Board>
+				<Aside />
+				<ScrollBtn />
 			</S.NotFoundWrap>
-			<C.Footer />
 		</>
 	)
 }

diff --git a/pages/accident/index.tsx b/pages/accident/index.tsx
@@ -6,9 +6,9 @@ import React, { PropsWithChildren } from 'react'
 import Docs from '@/types/docs.type'
 import DocsPropsType from '@/types/static/docs.props.type'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { AccodianMenu, Board, Classify, SubFooter } from '@/components'
+import { AccodianMenu, Aside, Board, Classify, ScrollBtn, SubFooter } from '@/components'
 
-const Accident = ({ docs, years }: DocsPropsType, { children }: PropsWithChildren) => {
+const Accident = ({ docs, years }: DocsPropsType) => {
 	const seoConfig: NextSeoProps = {
 		title: '부마위키 - 사건/사고',
 		description: '교내에서 일어나는 모든 사건/사고를 담은 페이지입니다.',
@@ -52,7 +52,8 @@ const Accident = ({ docs, years }: DocsPropsType, { children }: PropsWithChildre
 					</S.AccidentListWrap>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.AccidentWrap>
 		</>
 	)

diff --git a/pages/club/index.tsx b/pages/club/index.tsx
@@ -4,7 +4,7 @@ import * as getApi from '@/api/getDocs'
 import React, { PropsWithChildren } from 'react'
 import Docs from '@/types/docs.type'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { AccodianMenu, Board, Classify, SubFooter } from '@/components'
+import { AccodianMenu, Aside, Board, Classify, ScrollBtn, SubFooter } from '@/components'
 
 interface ClubDocsPropsType {
 	docs: {
@@ -13,7 +13,7 @@ interface ClubDocsPropsType {
 	}
 }
 
-const Club = ({ docs }: ClubDocsPropsType, { children }: PropsWithChildren) => {
+const Club = ({ docs }: ClubDocsPropsType) => {
 	const seoConfig: NextSeoProps = {
 		title: '부마위키 - 동아리',
 		description: '교내에서 활동하는 모든 동아리를 담은 페이지입니다.',
@@ -64,7 +64,8 @@ const Club = ({ docs }: ClubDocsPropsType, { children }: PropsWithChildren) => {
 					</S.ClubListWrap>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.ClubWrap>
 		</>
 	)

diff --git a/pages/create/index.tsx b/pages/create/index.tsx
@@ -12,10 +12,10 @@ import createInitState from '@/state/createInitState'
 import createDocsForm from '@/utils/document/createDocsForm'
 import { NextSeo, NextSeoProps } from 'next-seo'
 import useUser from '@/hooks/useUser'
-import { Board, SubFooter } from '@/components'
+import { Aside, Board, ScrollBtn, SubFooter } from '@/components'
 import createFormInitState from '@/state/createFormInitState'
 
-const Create = ({ children }: PropsWithChildren) => {
+const Create = () => {
 	const router = useRouter()
 	const { query } = router
 	const years = util.getAllYear()
@@ -206,7 +206,8 @@ const Create = ({ children }: PropsWithChildren) => {
 					</S.CreateSubmit>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.CreateWrap>
 		</>
 	)

diff --git a/pages/frame/index.tsx b/pages/frame/index.tsx
@@ -5,9 +5,9 @@ import React, { PropsWithChildren } from 'react'
 import Docs from '@/types/docs.type'
 import DocsPropsType from '@/types/static/docs.props.type'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { AccodianMenu, Board, Classify, SubFooter } from '@/components'
+import { AccodianMenu, Aside, Board, Classify, ScrollBtn, SubFooter } from '@/components'
 
-const Frame = ({ docs }: DocsPropsType, { children }: PropsWithChildren) => {
+const Frame = ({ docs }: DocsPropsType) => {
 	const seoConfig: NextSeoProps = {
 		title: `부마위키 - 틀`,
 		description: `부마위키의 모든 틀을 담은 페이지입니다.`,
@@ -48,7 +48,8 @@ const Frame = ({ docs }: DocsPropsType, { children }: PropsWithChildren) => {
 					</S.FrameListWrap>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.FrameWrap>
 		</>
 	)

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -2,10 +2,27 @@ import * as S from '../layout/index.style'
 
 import React from 'react'
 import { AccodianMenu, Aside, Board, Classify, ScrollBtn, SubFooter } from '@/components'
+import { NextSeo, NextSeoProps } from 'next-seo'
 
 const Home = () => {
+	const seoConfig: NextSeoProps = {
+		title: `부마위키 - 대문`,
+		description: `역사의 고서, 부마위키`,
+		openGraph: {
+			type: 'website',
+			title: `부마위키 - 대문`,
+			description: `역사의 고서, 부마위키`,
+			images: [
+				{
+					url: '/images/meta-img.png',
+				},
+			],
+		},
+	}
+
 	return (
 		<>
+			<NextSeo {...seoConfig} />
 			<S.HomeWrap>
 				<Board>
 					<S.HomeTitleWrap>

diff --git a/pages/mypage/index.tsx b/pages/mypage/index.tsx
@@ -9,9 +9,9 @@ import { useRecoilValue, useSetRecoilState } from 'recoil'
 import Contributors from '@/types/contributors.type'
 import { Storage } from '@/lib/storage/storage'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { AccodianMenu, Board, Classify } from '@/components'
+import { AccodianMenu, Aside, Board, Classify, ScrollBtn } from '@/components'
 
-const MyPage = ({ children }: PropsWithChildren) => {
+const MyPage = () => {
 	const user = useRecoilValue(userState)
 	const setUser = useSetRecoilState(userState)
 
@@ -91,7 +91,8 @@ const MyPage = ({ children }: PropsWithChildren) => {
 						)}
 					</S.MyPageInfoWrap>
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.MyPageWrap>
 		</>
 	)

diff --git a/pages/popular/index.tsx b/pages/popular/index.tsx
@@ -1,13 +1,13 @@
 import * as getApi from '@/api/getDocs'
 import * as S from '../../layout/popular/style'
 
-import React, { PropsWithChildren } from 'react'
+import React from 'react'
 import Docs from '@/types/docs.type'
 import DocsPropsType from '@/types/static/docs.props.type'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { AccodianMenu, Board, Classify, SubFooter } from '@/components'
+import { AccodianMenu, Aside, Board, Classify, ScrollBtn, SubFooter } from '@/components'
 
-const Popular = ({ docs }: DocsPropsType, { children }: PropsWithChildren) => {
+const Popular = ({ docs }: DocsPropsType) => {
 	const seoConfig: NextSeoProps = {
 		title: `부마위키 - 인기문서`,
 		description: `부마위키 문서 중 인기있는 문서를 담은 페이지입니다.`,
@@ -50,7 +50,8 @@ const Popular = ({ docs }: DocsPropsType, { children }: PropsWithChildren) => {
 					</S.PopularListWrap>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.PopularWrap>
 		</>
 	)

diff --git a/pages/search/[search].tsx b/pages/search/[search].tsx
@@ -7,15 +7,15 @@ import Docs from '@/types/docs.type'
 import { useRouter } from 'next/router'
 import { GetStaticProps } from 'next'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { Board, Classify, SubFooter } from '@/components'
+import { Aside, Board, Classify, ScrollBtn, SubFooter } from '@/components'
 
 interface SingleDocsPropsType {
 	results: Docs[]
 	redirect: boolean
 	searchValue: string
 }
 
-const Search = ({ results, redirect, searchValue }: SingleDocsPropsType, { children }: PropsWithChildren) => {
+const Search = ({ results, redirect, searchValue }: SingleDocsPropsType) => {
 	const router = useRouter()
 
 	const seoConfig: NextSeoProps = {
@@ -73,7 +73,8 @@ const Search = ({ results, redirect, searchValue }: SingleDocsPropsType, { child
 					</S.SearchResult>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.SearchWrap>
 		</>
 	)

diff --git a/pages/student/index.tsx b/pages/student/index.tsx
@@ -6,9 +6,9 @@ import React, { PropsWithChildren } from 'react'
 import Docs from '@/types/docs.type'
 import DocsPropsType from '@/types/static/docs.props.type'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { AccodianMenu, Board, Classify, SubFooter } from '@/components'
+import { AccodianMenu, Aside, Board, Classify, ScrollBtn, SubFooter } from '@/components'
 
-const Student = ({ docs, years }: DocsPropsType, { children }: PropsWithChildren) => {
+const Student = ({ docs, years }: DocsPropsType) => {
 	const seoConfig: NextSeoProps = {
 		title: `부마위키 - 학생`,
 		description: `교내의 모든 학생을 담은 페이지입니다.`,
@@ -53,7 +53,8 @@ const Student = ({ docs, years }: DocsPropsType, { children }: PropsWithChildren
 					</S.StudentListWrap>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.StudentWrap>
 		</>
 	)

diff --git a/pages/teacher/index.tsx b/pages/teacher/index.tsx
@@ -4,7 +4,7 @@ import * as getApi from '@/api/getDocs'
 import React, { PropsWithChildren } from 'react'
 import Docs from '@/types/docs.type'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { AccodianMenu, Board, Classify, SubFooter } from '@/components'
+import { AccodianMenu, Aside, Board, Classify, ScrollBtn, SubFooter } from '@/components'
 
 interface TeacherDocsPropsType {
 	docs: {
@@ -14,7 +14,7 @@ interface TeacherDocsPropsType {
 	}
 }
 
-const Teacher = ({ docs }: TeacherDocsPropsType, { children }: PropsWithChildren) => {
+const Teacher = ({ docs }: TeacherDocsPropsType) => {
 	const seoConfig: NextSeoProps = {
 		title: `부마위키 - 선생님`,
 		description: `교내의 모든 선생님을 담은 페이지입니다.`,
@@ -75,7 +75,8 @@ const Teacher = ({ docs }: TeacherDocsPropsType, { children }: PropsWithChildren
 					</S.TeacherList>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.TeacherWrap>
 		</>
 	)

diff --git a/pages/update/[title].tsx b/pages/update/[title].tsx
@@ -16,7 +16,7 @@ import Docs from '@/types/docs.type'
 import { GetStaticProps } from 'next'
 import { Storage } from '@/lib/storage/storage'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { Board, SubFooter } from '@/components'
+import { Aside, Board, ScrollBtn, SubFooter } from '@/components'
 import Image from 'next/image'
 import theme from '@/styles/theme'
 
@@ -25,7 +25,7 @@ interface SinglDocsPropsType {
 	title: string
 }
 
-const Update = ({ defaultDocs, title }: SinglDocsPropsType, { children }: PropsWithChildren) => {
+const Update = ({ defaultDocs, title }: SinglDocsPropsType) => {
 	const router = useRouter()
 	const user = useRecoilValue(userState)
 	const textareaRef = React.useRef<HTMLTextAreaElement>(null)
@@ -150,7 +150,8 @@ const Update = ({ defaultDocs, title }: SinglDocsPropsType, { children }: PropsW
 					</S.DocsContentsWrap>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.DocsWrap>
 		</>
 	)

diff --git a/pages/user/[userId].tsx b/pages/user/[userId].tsx
@@ -8,9 +8,9 @@ import { useQuery } from 'react-query'
 import UserType from '@/types/user.type'
 import { useRouter } from 'next/router'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { AccodianMenu, Aside, Board, Classify } from '@/components'
+import { AccodianMenu, Aside, Board, Classify, ScrollBtn } from '@/components'
 
-const User = ({ children }: PropsWithChildren) => {
+const User = () => {
 	const [user, setUser] = React.useState<UserType>()
 	const router = useRouter()
 	useQuery('otherUser', () => api.getOtherUser(parseInt(router.query.userId as string)), {
@@ -70,7 +70,8 @@ const User = ({ children }: PropsWithChildren) => {
 						<S.UserLine />
 					</S.UserInfoWrap>
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.UserWrap>
 		</div>
 	)

diff --git a/pages/version/[docs]/detail/[versionId].tsx b/pages/version/[docs]/detail/[versionId].tsx
@@ -7,7 +7,7 @@ import { VersionDocsService } from '@/types/version.type'
 import { decodeContents } from '@/utils/document/requestContents'
 import { GetStaticProps } from 'next'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { AccodianMenu, Board, Classify, SubFooter } from '@/components'
+import { AccodianMenu, Aside, Board, Classify, ScrollBtn, SubFooter } from '@/components'
 
 interface VersionDetailPropsType {
 	title: string
@@ -16,7 +16,7 @@ interface VersionDetailPropsType {
 	versionId: string
 }
 
-const VersionDetail = ({ title, docsType, docs, versionId }: VersionDetailPropsType, { children }: PropsWithChildren) => {
+const VersionDetail = ({ title, docsType, docs, versionId }: VersionDetailPropsType) => {
 	const seoConfig: NextSeoProps = {
 		title: `부마위키 문서 기록 - ${title}:${versionId}`,
 		description: `"${title}" 문서의 예전 기록 페이지입니다.`,
@@ -64,7 +64,8 @@ const VersionDetail = ({ title, docsType, docs, versionId }: VersionDetailPropsT
 					</S.DocsContentsWrap>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.DocsWrap>
 		</div>
 	)

diff --git a/pages/version/[docs]/index.tsx b/pages/version/[docs]/index.tsx
@@ -3,18 +3,18 @@ import * as util from '@/utils'
 import * as S from '../../../layout/docs/style'
 import * as V from '../../../layout/version/style'
 
-import React, { PropsWithChildren } from 'react'
+import React from 'react'
 import { VersionDocs } from '@/types/version.type'
 import { GetStaticProps } from 'next'
 import { NextSeo, NextSeoProps } from 'next-seo'
-import { Board, SubFooter } from '@/components'
+import { Aside, Board, ScrollBtn, SubFooter } from '@/components'
 
 interface SingleDocsPropsType {
 	version: VersionDocs[]
 	docsName: string
 }
 
-const Version = ({ version, docsName }: SingleDocsPropsType, { children }: PropsWithChildren) => {
+const Version = ({ version, docsName }: SingleDocsPropsType) => {
 	const seoConfig: NextSeoProps = {
 		title: `부마위키 문서 수정 기록 - ${docsName}`,
 		description: `"${docsName}" 문서의 수정 기록 페이지입니다.`,
@@ -55,7 +55,8 @@ const Version = ({ version, docsName }: SingleDocsPropsType, { children }: Props
 					</S.DocsContentsWrap>
 					<SubFooter />
 				</Board>
-				{children}
+				<ScrollBtn />
+				<Aside />
 			</S.DocsWrap>
 		</>
 	)