diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 0000000..8b757b2 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules \ No newline at end of file diff --git a/package.json b/package.json index f40ecd8..af4a563 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "module", "scripts": { "dev": "node src/blogPostGenerator.js && next dev", - "build": "next build", + "build": "node src/blogPostGenerator.js && next build", "start": "node src/blogPostGenerator.js;next start", "lint": "next lint" }, @@ -14,8 +14,6 @@ "@emotion/styled": "^11.11.0", "@mui/lab": "^5.0.0-alpha.153", "@mui/material": "^5.14.18", - "@vercel/edge-config": "^0.4.1", - "@vercel/speed-insights": "^1.0.2", "dayjs": "^1.11.10", "feed": "^4.2.2", "glob": "^10.3.10", @@ -37,5 +35,6 @@ "eslint": "^8", "eslint-config-next": "14.0.2", "typescript": "^5" - } + }, + "packageManager": "yarn@4.1.1" } diff --git a/src/app/(pages)/blog/[id]/page.tsx b/src/app/(pages)/blog/[id]/page.tsx index 56e16db..c4c5d22 100644 --- a/src/app/(pages)/blog/[id]/page.tsx +++ b/src/app/(pages)/blog/[id]/page.tsx @@ -5,13 +5,15 @@ import { atomDark } from 'react-syntax-highlighter/dist/esm/styles/prism' import BlogNavBar from "../../../_components/NavBar"; import '../../../_css/BlogPost.css'; import React from "react"; -import jsonDataArray from '../../../../../public/blogPosts.json'; +import jsonDataArray from '@/blogPosts.json'; import { redirect } from "next/navigation"; import { Metadata } from 'next'; import dayjs from 'dayjs'; import customParseFormat from 'dayjs/plugin/customParseFormat'; dayjs.extend(customParseFormat) +export const runtime = 'edge'; + export default async function Page({ params }: { params: { id: string } }) { const id = parseInt(params.id); if (Number.isNaN(id)) redirect('/blog') diff --git a/src/app/(pages)/blog/page.tsx b/src/app/(pages)/blog/page.tsx index fc2cebc..4fc63ef 100644 --- a/src/app/(pages)/blog/page.tsx +++ b/src/app/(pages)/blog/page.tsx @@ -1,5 +1,5 @@ import '../../../app/_css/Blog.css'; -import blogPosts from '../../../../public/blogPosts.json' +import blogPosts from '@/blogPosts.json' import BlogPostCard from '../../../app/_components/BlogPostCard'; import BlogNavBar from '../../_components/NavBar'; import BlogRssDial from '@/app/_components/BlogRssDial'; diff --git a/src/app/(pages)/go/[name]/page.tsx b/src/app/(pages)/go/[name]/page.tsx deleted file mode 100644 index 7e540df..0000000 --- a/src/app/(pages)/go/[name]/page.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import NavBar from "@/app/_components/NavBar"; -import { get } from '@vercel/edge-config'; -import Link from "next/link"; -import { redirect } from "next/navigation"; -import '../../../_css/LinkShortenerVerification.css'; -import { Metadata } from 'next'; - -export default async function Page({ params }: { params: { name: string } }) { - const getLink = await get(params.name) as string | undefined; - if (!getLink) { - redirect('../notfound') - } - const url = new URL(getLink); - return ( -
- -
-

This link sends you to {url.hostname}

- Go there I don't care -
-
- ) -} - -export async function generateMetadata({ params }: { params: { name: string } }): Promise { - return { - title: `Link shortener ID ${params.name}` - } -} \ No newline at end of file diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 2b635e0..818d7f8 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -2,7 +2,6 @@ import type { Metadata } from 'next' import { Inter } from 'next/font/google' import './globals.css' import { RootStyleRegistry } from './_components/ThemeRegistry/EmotionRootStyleRegistry'; -import { SpeedInsights } from "@vercel/speed-insights/next" const inter = Inter({ subsets: ['latin'] }) @@ -18,7 +17,6 @@ export default function RootLayout({ }) { return ( -