From 5a7a14da50028e1aa94bb3c0f231a74c72b27c08 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sat, 17 Jun 2023 11:36:33 -0700 Subject: [PATCH] fix: navigate next13.x upgrade --- .idea/.gitignore | 5 ++++ .idea/augurymetal.com.iml | 12 +++++++++ components/Card.tsx | 2 +- components/Footer.tsx | 2 +- components/LayoutWrapper.tsx | 6 ++--- components/Link.tsx | 27 -------------------- components/MDXComponents.tsx | 2 -- components/MobileNav.tsx | 4 +-- components/Pagination.tsx | 4 +-- components/PhotoGallery.tsx | 46 ++++++++++++++++------------------- components/Tag.tsx | 9 ++++--- layouts/AuthorLayout.tsx | 8 +++--- layouts/ListLayout.tsx | 4 +-- layouts/PostLayout.tsx | 10 ++++---- layouts/PostSimple.tsx | 4 +-- package.json | 12 ++++----- pages/404.tsx | 4 +-- pages/index.tsx | 4 +-- pages/tags.tsx | 6 ++--- pages/tour-archive.tsx | 4 +-- pages/tour.tsx | 4 +-- tailwind.config.js | 7 +++--- yarn.lock | Bin 0 -> 372346 bytes 23 files changed, 85 insertions(+), 101 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/augurymetal.com.iml delete mode 100644 components/Link.tsx create mode 100644 yarn.lock diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..b58b603 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/augurymetal.com.iml b/.idea/augurymetal.com.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/augurymetal.com.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/components/Card.tsx b/components/Card.tsx index 143681e..c2e6618 100644 --- a/components/Card.tsx +++ b/components/Card.tsx @@ -1,5 +1,5 @@ import Image from './Image' -import Link from './Link' +import Link from 'next/link' const Card = ({ title, description, imgSrc, href }) => (
diff --git a/components/Footer.tsx b/components/Footer.tsx index efe49a6..7aa2c80 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -1,4 +1,4 @@ -import Link from './Link' +import Link from 'next/link' import siteMetadata from '@/data/siteMetadata' import SocialIcon from '@/components/social-icons' diff --git a/components/LayoutWrapper.tsx b/components/LayoutWrapper.tsx index 689f74b..7c8567d 100644 --- a/components/LayoutWrapper.tsx +++ b/components/LayoutWrapper.tsx @@ -1,6 +1,6 @@ import Image from '@/components/Image' import headerNavLinks from '@/data/headerNavLinks' -import Link from './Link' +import Link from 'next/link' import SectionContainer from './SectionContainer' import Footer from './Footer' import MobileNav from './MobileNav' @@ -17,8 +17,8 @@ const LayoutWrapper = ({ children }: Props) => { header banner
diff --git a/components/Link.tsx b/components/Link.tsx deleted file mode 100644 index 1c46655..0000000 --- a/components/Link.tsx +++ /dev/null @@ -1,27 +0,0 @@ -/* eslint-disable jsx-a11y/anchor-has-content */ -import Link from 'next/link' -import { AnchorHTMLAttributes, DetailedHTMLProps } from 'react' - -const CustomLink = ({ - href, - ...rest -}: DetailedHTMLProps, HTMLAnchorElement>) => { - const isInternalLink = href && href.startsWith('/') - const isAnchorLink = href && href.startsWith('#') - - if (isInternalLink) { - return ( - - - - ) - } - - if (isAnchorLink) { - return - } - - return -} - -export default CustomLink diff --git a/components/MDXComponents.tsx b/components/MDXComponents.tsx index b10d775..629712b 100644 --- a/components/MDXComponents.tsx +++ b/components/MDXComponents.tsx @@ -2,7 +2,6 @@ import React, { useMemo } from 'react' import { ComponentMap, getMDXComponent } from 'mdx-bundler/client' import Image from './Image' -import CustomLink from './Link' import TOCInline from './TOCInline' import Pre from './Pre' import { BlogNewsletterForm } from './NewsletterForm' @@ -16,7 +15,6 @@ export const MDXComponents: ComponentMap = { Image, //@ts-ignore TOCInline, - a: CustomLink, pre: Pre, wrapper: Wrapper, //@ts-ignore diff --git a/components/MobileNav.tsx b/components/MobileNav.tsx index 19a9680..2496b49 100644 --- a/components/MobileNav.tsx +++ b/components/MobileNav.tsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import Link from './Link' +import Link from 'next/link' import headerNavLinks from '@/data/headerNavLinks' const MobileNav = () => { @@ -21,7 +21,7 @@ const MobileNav = () => {