Merge branch 'add-program' into devdev

constmoon · constmoon · commit eaf41b3397ae · 2022-09-24T16:50:08.000+09:00
diff --git a/frontend/data/enums/PageName.ts b/frontend/data/enums/PageName.ts
@@ -12,6 +12,7 @@ export enum PageName {
     CfpGuide = 'CfpGuide',
     Sponsor = 'Sponsor',
     SponsorList = 'SponsorList',
+    SponsorPatrons = 'SponsorPatrons',
     SponsorProspectus = 'SponsorProspectus',
     SponsorJoin = 'SponsorJoin',
     SponsorBenefit = 'SponsorBenefit',
diff --git a/frontend/interfaces/PageProps.ts b/frontend/interfaces/PageProps.ts
@@ -13,6 +13,7 @@ export interface ContentPage extends PageProps {
 }
 
 export interface LocalePage<T> extends PageProps {
+    title?: string
     ko: T
     en: T
 }
diff --git a/frontend/locales/en/pageTitle.ts b/frontend/locales/en/pageTitle.ts
@@ -14,6 +14,7 @@ export default {
     [PageName.CfpGuide]: 'How to Submit a Proposal',
     [PageName.Sponsor]: 'Sponsor',
     [PageName.SponsorList]: 'Sponsors',
+    [PageName.SponsorPatrons]: 'Patrons',
     [PageName.SponsorProspectus]: 'Prospectus',
     [PageName.SponsorJoin]: 'Join as Sponsor',
     [PageName.SponsorBenefit]: 'Benefit',
diff --git a/frontend/locales/ko/pageTitle.ts b/frontend/locales/ko/pageTitle.ts
@@ -14,6 +14,7 @@ export default {
     [PageName.CfpGuide]: '발표안 작성 가이드',
     [PageName.Sponsor]: '후원하기',
     [PageName.SponsorList]: '후원사',
+    [PageName.SponsorPatrons]: '개인 후원자',
     [PageName.SponsorProspectus]: '후원사 안내',
     [PageName.SponsorJoin]: '후원사로 참여하기',
     [PageName.SponsorBenefit]: '후원사 혜택 설명',
diff --git a/frontend/pages/_app.tsx b/frontend/pages/_app.tsx
@@ -7,6 +7,7 @@ import { ThemeProvider } from 'styled-components'
 import '../assets/styles/global.css'
 import Theme from '../assets/styles/theme'
 import { NextSeo } from 'next-seo'
+import Head from 'next/head'
 
 const App = ({
     Component,
@@ -19,14 +20,20 @@ const App = ({
     const { pathname } = router
 
     const pageName = pageProps?.title ?? ''
-    const pageTitle =
-        pageName !== ''
-            ? `${t(`pageTitle:${pageName}`)} : ${t(`label:siteTitle`)}`
-            : `${t(`label:siteTitle`)}`
     const description = `${t(`label:pyconkrTitle`)}: ${t(`label:pyconkrDate`)}`
 
     const hideSponsor = pathname === '/sponsor'
 
+    const getPageTitle = (): string => {
+        if (i18n.exists(`pageTitle:${pageName}`)) {
+            return `${t(`pageTitle:${pageName}`)} : ${t(`label:siteTitle`)}`
+        } else if (pageProps?.title) {
+            return `${pageProps?.title} : ${t(`label:siteTitle`)}`
+        }
+        return `${t(`label:siteTitle`)}`
+    }
+    const pageTitle = getPageTitle()
+
     return (
         <>
             <I18nextProvider i18n={i18n}>
@@ -47,6 +54,9 @@ const App = ({
                             ]
                         }}
                     />
+                    <Head>
+                        <title>{pageTitle}</title>
+                    </Head>
                     <Layout
                         locale={locale}
                         pageName={pageName}
diff --git a/frontend/pages/program/talks/[id].tsx b/frontend/pages/program/talks/[id].tsx
@@ -80,6 +80,7 @@ export const getServerSideProps: GetServerSideProps = async (
         return {
             props: {
                 locale,
+                title: data.title,
                 ko: data,
                 en: data
             }
diff --git a/frontend/pages/sponsor/list/[id].tsx b/frontend/pages/sponsor/list/[id].tsx
@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next'
 import { media } from '../../../assets/styles/mixin'
 
 interface SponsorDetailProps extends LocalePage<ISponsorDetail> {
+    title: string
     locale: string
 }
 
@@ -70,6 +71,7 @@ export const getServerSideProps: GetServerSideProps = async (
         return {
             props: {
                 locale,
+                title: data.name,
                 ko: data,
                 en: data
             }
diff --git a/frontend/pages/sponsor/patrons.tsx b/frontend/pages/sponsor/patrons.tsx
@@ -0,0 +1,27 @@
+import React from 'react'
+import type { NextPage, GetServerSideProps } from 'next'
+import { useTranslation } from 'react-i18next'
+import { PageName } from '../../data/enums/PageName'
+import PageTitle from '../../components/core/PageTitle'
+import { PageProps } from '../../interfaces/PageProps'
+
+const Patrons: NextPage = (props: PageProps) => {
+    const { t } = useTranslation()
+
+    return (
+        <div>
+            <PageTitle title={props.pageName} />
+            {t('label:preparing')}
+        </div>
+    )
+}
+
+export const getServerSideProps: GetServerSideProps = async () => {
+    return {
+        props: {
+            title: PageName.SponsorPatrons
+        }
+    }
+}
+
+export default Patrons
diff --git a/frontend/routes/routes.ts b/frontend/routes/routes.ts
@@ -61,6 +61,10 @@ export const routes: RouteType[] = [
                 path: '/sponsor/list',
                 name: PageName.SponsorList
             },
+            {
+                path: '/sponsor/patron',
+                name: PageName.SponsorPatrons
+            },
             {
                 path: '/sponsor/prospectus',
                 name: PageName.SponsorProspectus

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ export interface ContentPage extends PageProps {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`export interface LocalePage<T> extends PageProps {`
	`16`	`+ title?: string`
`16`	`17`	`ko: T`
`17`	`18`	`en: T`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ export const getServerSideProps: GetServerSideProps = async (`
`80`	`80`	`return {`
`81`	`81`	`props: {`
`82`	`82`	`locale,`
	`83`	`+ title: data.title,`
`83`	`84`	`ko: data,`
`84`	`85`	`en: data`
`85`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next'`
`10`	`10`	`import { media } from '../../../assets/styles/mixin'`
`11`	`11`
`12`	`12`	`interface SponsorDetailProps extends LocalePage<ISponsorDetail> {`
	`13`	`+ title: string`
`13`	`14`	`locale: string`
`14`	`15`	`}`
`15`	`16`
`@@ -70,6 +71,7 @@ export const getServerSideProps: GetServerSideProps = async (`
`70`	`71`	`return {`
`71`	`72`	`props: {`
`72`	`73`	`locale,`
	`74`	`+ title: data.name,`
`73`	`75`	`ko: data,`
`74`	`76`	`en: data`
`75`	`77`	`}`