header 수정

components/Footer.tsx

@@ -7,11 +7,8 @@ import { FaTwitter } from '@react-icons/all-files/fa/FaTwitter'
 import { FaYoutube } from '@react-icons/all-files/fa/FaYoutube'
 import { FaZhihu } from '@react-icons/all-files/fa/FaZhihu'
 import { IoMoonSharp } from '@react-icons/all-files/io5/IoMoonSharp'
-<<<<<<< HEAD
 import { FaInstagram } from '@react-icons/all-files/fa/FaInstagram'
-=======
 import { IoSunnyOutline } from '@react-icons/all-files/io5/IoSunnyOutline'
->>>>>>> upstream/main
 
 import * as config from '@/lib/config'
 import { useDarkMode } from '@/lib/use-dark-mode'
@@ -68,7 +65,7 @@ export const FooterImpl: React.FC = () => {
           </a>
         )}
       </div>
-
+      
       <div className={styles.social}>
         {config.twitter && (
           <a
@@ -118,7 +115,6 @@ export const FooterImpl: React.FC = () => {
           </a>
         )}
 
-<<<<<<< HEAD
         {config.instagram && (
           <a
             className={styles.instagram}
@@ -128,7 +124,9 @@ export const FooterImpl: React.FC = () => {
             rel='noopener noreferrer'
           >
             <FaInstagram />
-=======
+          </a>
+        )}
+
         {config.newsletter && (
           <a
             className={styles.newsletter}
@@ -150,7 +148,6 @@ export const FooterImpl: React.FC = () => {
             rel='noopener noreferrer'
           >
             <FaYoutube />
->>>>>>> upstream/main
           </a>
         )}
       </div>

components/NotionPage.tsx

@@ -6,17 +6,10 @@ import { useRouter } from 'next/router'
 
 import cs from 'classnames'
 import { PageBlock } from 'notion-types'
-<<<<<<< HEAD
-
-// import TweetEmbed from 'react-tweet-embed'
-
-// core notion renderer
-=======
 import { formatDate, getBlockTitle, getPageProperty } from 'notion-utils'
 import BodyClassName from 'react-body-classname'
->>>>>>> upstream/main
 import { NotionRenderer } from 'react-notion-x'
-import TweetEmbed from 'react-tweet-embed'
+// import TweetEmbed from 'react-tweet-embed'
 import { useSearchParam } from 'react-use'
 
 import * as config from '@/lib/config'
@@ -28,16 +21,13 @@ import { useDarkMode } from '@/lib/use-dark-mode'
 
 import { Footer } from './Footer'
 import { GitHubShareButton } from './GitHubShareButton'
-<<<<<<< HEAD
 import { ReactUtterances } from './ReactUtterances'
 // import { ReactCusdis } from 'react-cusdis'
-=======
 import { Loading } from './Loading'
 import { NotionPageHeader } from './NotionPageHeader'
 import { Page404 } from './Page404'
 import { PageAside } from './PageAside'
 import { PageHead } from './PageHead'
->>>>>>> upstream/main
 import styles from './styles.module.css'
 
 // -----------------------------------------------------------------------------

components/NotionPageHeader.tsx

@@ -85,4 +85,4 @@ export const NotionPageHeader: React.FC<{
       </div>
     </header>
   )
-}
+}

pages/api/social-image.tsx

@@ -25,18 +25,6 @@ export default async function OGImage(req: NextRequest) {
     return new Response('Invalid notion page id', { status: 400 })
   }
 
-<<<<<<< HEAD
-const style = `
-
-@import url('https://fonts.googleapis.com/css2?family=Nanum+Gothic:wght@700&display=swap');
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: normal;
-  src: url(data:font/woff2;charset=utf-8;base64,${interRegular}) format('woff2');
-}
-=======
   const pageInfoRes = await fetch(`${apiHost}${api.getNotionPageInfo}`, {
     method: 'POST',
     body: JSON.stringify({ pageId }),
@@ -49,7 +37,6 @@ const style = `
   }
   const pageInfo: NotionPageInfo = await pageInfoRes.json()
   console.log(pageInfo)
->>>>>>> upstream/main
 
   const [interRegularFont, interBoldFont] = await Promise.all([
     interRegularFontP,
@@ -86,13 +73,6 @@ const style = `
               // background, but Satori is still very new, so hopefully we can re-add
               // the blur soon.
 
-<<<<<<< HEAD
-body {
-  font-family: 'Nanum Gothic', sans-serif;
-  padding: 0;
-  margin: 0;
-}
-=======
               // backgroundImage: pageInfo.image
               //   ? `url(${pageInfo.image})`
               //   : undefined,
@@ -103,7 +83,6 @@ body {
             }}
           />
         )}
->>>>>>> upstream/main
 
         <div
           style={{

site.config.ts

@@ -58,16 +58,17 @@ export default siteConfig({
 
   // whether to use the default notion navigation style or a custom one with links to
   // important pages
-  navigationStyle: 'default'
+
   // navigationStyle: 'default',
-  // navigationLinks: [
-  //   {
-  //     title: 'About me',
-  //     pageId: 'a32a59aec23c41e08452757e94d96418'
-  //   },
+  navigationStyle: 'custom',
+  navigationLinks: [
+    {
+      title: 'About me',
+      url: 'https://www.linkedin.com/in/hanmil-lee-828a57187/'
+    },
     // {
     //   title: 'Contact',
     //   pageId: '6a29ebcb935a4f0689fe661ab5f3b8d1'
     // }
-  // ]
+  ]
 })