Housekeeping

daneden · May 1, 2023 · e3ef4aa · e3ef4aa
1 parent 8cd724a
commit e3ef4aa
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 49 deletions.
diff --git a/app/(branches)/blog/2018/subatomic-design-systems/page.mdx b/app/(branches)/blog/2018/subatomic-design-systems/page.mdx
@@ -162,11 +162,11 @@ Button = Label + View
 $$
 
 $$
-Label = p_\{type\} + p_\{color\}
+Label = p_{type} + p_{color}
 $$
 
 $$
-View = p_\{color\} + p_\{line\} + p_\{spacing\}
+View = p_{color} + p_{line} + p_{spacing}
 $$
 
 ## Views comprise the majority of the system

diff --git a/app/(branches)/blog/page.tsx b/app/(branches)/blog/page.tsx
@@ -1,5 +1,5 @@
 import { getPosts } from "@/app/get-posts"
-import formatDate from "@/utils/formatDate"
+import formatDate from "@/app/utils/formatDate"
 import { Metadata } from "next"
 import Link from "next/link"
 

diff --git a/app/(branches)/layout.tsx b/app/(branches)/layout.tsx
@@ -2,8 +2,8 @@ import Footer from "@/app/components/Footer"
 import Header from "@/app/components/Header"
 import SkipLink from "@/app/components/SkipLink"
 import Wrapper from "@/app/components/Wrapper"
-import defaultMetadata, { config } from "@/data/siteconfig"
 import { Analytics } from "@vercel/analytics/react"
+import { Metadata } from "next"
 import { JetBrains_Mono } from "next/font/google"
 import { soehne, tiemposHeadline, tiemposText } from "../fonts"
 import "../styles/global.css"
@@ -15,7 +15,14 @@ const jetbrainsMono = JetBrains_Mono({
   display: "swap",
 })
 
-export const metadata = defaultMetadata
+export const metadata: Metadata = {
+  title: {
+    template: `%s | "Daniel Eden, Designer"`,
+    absolute: "Daniel Eden, Designer",
+  },
+  description:
+    "The personal site, blog, and portfolio of Daniel Eden, a designer writing and thinking about design systems.",
+}
 
 export default function BranchPageLayout({
   children,
@@ -29,7 +36,7 @@ export default function BranchPageLayout({
       <body>
         <SkipLink />
         <div className={`sp-m ${jetbrainsMono.variable}`}>
-          <Header siteTitle={config.title} />
+          <Header />
           <Wrapper>{children}</Wrapper>
           <Footer />
         </div>

diff --git a/app/(branches)/playlist/page.tsx b/app/(branches)/playlist/page.tsx
@@ -1,6 +1,6 @@
 import Media, { MediaItem } from "@/app/components/Media"
-import { client } from "@/utils/graphql-client"
-import widont from "@/utils/widont"
+import { client } from "@/app/utils/graphql-client"
+import widont from "@/app/utils/widont"
 import { gql } from "graphql-request"
 import { Metadata } from "next"
 import { cache } from "react"

diff --git a/app/(root)/page.tsx b/app/(root)/page.tsx
@@ -1,13 +1,20 @@
 /* eslint-disable prefer-const */
 import LightswitchImage from "@/app/components/LightSwitchImage"
 import Timeline from "@/app/components/Timeline"
-import defaultMetadata from "@/data/siteconfig"
 import { Metadata } from "next"
 import Image from "next/image"
 import Link from "next/link"
 import styles from "./home.module.css"
+import wwcg from "./wwcg.jpg"
 
-export const metadata: Metadata = defaultMetadata
+export const metadata: Metadata = {
+  title: {
+    template: `%s | "Daniel Eden, Designer"`,
+    absolute: "Daniel Eden, Designer",
+  },
+  description:
+    "The personal site, blog, and portfolio of Daniel Eden, a designer writing and thinking about design systems.",
+}
 
 export default function HomePage() {
   return (
@@ -47,9 +54,7 @@ export default function HomePage() {
           </p>
           <div className="align-bottom">
             <Image
-              src="/images/wwcg.jpg"
-              width={686}
-              height={386}
+              src={wwcg}
               alt="Daniel Eden presenting “Where We Can Go” at Clarity Conference 2019"
             />
           </div>

diff --git a/public/images/wwcg.jpg → app/(root)/wwcg.jpg b/public/images/wwcg.jpg → app/(root)/wwcg.jpg
diff --git a/app/api/opengraph-image/route.ts b/app/api/opengraph-image/route.ts
@@ -1,4 +1,4 @@
-import opengraphImage from "@/utils/opengraphImage"
+import opengraphImage from "@/app/utils/opengraphImage"
 import { NextRequest } from "next/server"
 
 export async function GET(request: NextRequest) {

diff --git a/app/components/Header/index.tsx b/app/components/Header/index.tsx
@@ -1,10 +1,6 @@
 import Link from "next/link"
 import styles from "./styles.module.css"
 
-interface HeaderProps {
-  siteTitle: string
-}
-
 const links = [
   {
     to: "/blog",
@@ -20,12 +16,12 @@ const links = [
   },
 ]
 
-const Header = ({ siteTitle }: HeaderProps) => {
+const Header = () => {
   return (
     <>
       <header className={styles.root}>
         <Link className="plainlink" href="/">
-          {siteTitle}
+          Daniel Eden, Designer
         </Link>
 
         <nav>

diff --git a/public/images/face.jpeg → app/icon.jpeg b/public/images/face.jpeg → app/icon.jpeg
diff --git a/app/opengraph-image.ts b/app/opengraph-image.ts
@@ -1,4 +1,4 @@
-import opengraphImage from "@/utils/opengraphImage"
+import opengraphImage from "@/app/utils/opengraphImage"
 
 export default async function og() {
   return await opengraphImage()

diff --git a/src/data/timeline.json → app/timeline.json b/src/data/timeline.json → app/timeline.json
diff --git a/src/utils/formatDate.ts → app/utils/formatDate.ts b/src/utils/formatDate.ts → app/utils/formatDate.ts
diff --git a/src/utils/graphql-client.ts → app/utils/graphql-client.ts b/src/utils/graphql-client.ts → app/utils/graphql-client.ts
diff --git a/src/utils/mdxPlugins.mjs → app/utils/mdxPlugins.mjs b/src/utils/mdxPlugins.mjs → app/utils/mdxPlugins.mjs
diff --git a/src/utils/opengraphImage.tsx → app/utils/opengraphImage.tsx b/src/utils/opengraphImage.tsx → app/utils/opengraphImage.tsx
@@ -1,5 +1,4 @@
-import { config } from "@/data/siteconfig"
-import widont from "@/utils/widont"
+import widont from "@/app/utils/widont"
 import { ImageResponse } from "next/server"
 
 const tiemposHeadline = fetch(
@@ -10,7 +9,9 @@ const soehne = fetch(
   new URL("https://daneden.me/og-fonts/Soehne-Buch.otf")
 ).then((res) => res.arrayBuffer())
 
-export default async function opengraphImage(title = config.title) {
+const defaultTitle = "Daniel Eden, Designer"
+
+export default async function opengraphImage(title = defaultTitle) {
   const tiemposFontData = await tiemposHeadline
   const soehneFontData = await soehne
 
@@ -55,7 +56,7 @@ export default async function opengraphImage(title = config.title) {
             right: -80,
           }}
         >
-          {title != config.title ? config.title : null}
+          {title != defaultTitle ? defaultTitle : null}
         </div>
       </div>
     ),

diff --git a/src/utils/widont.ts → app/utils/widont.ts b/src/utils/widont.ts → app/utils/widont.ts
diff --git a/next.config.mjs b/next.config.mjs
@@ -1,5 +1,5 @@
 import nextMdx from "@next/mdx"
-import { rehypePlugins, remarkPlugins } from "./src/utils/mdxPlugins.mjs"
+import { rehypePlugins, remarkPlugins } from "./app/utils/mdxPlugins.mjs"
 
 const withMDX = nextMdx({
   options: {

diff --git a/public/images/favicon.svg b/public/images/favicon.svg
diff --git a/public/images/og.png b/public/images/og.png
diff --git a/public/images/outbound.svg b/public/images/outbound.svg
diff --git a/public/images/solstice.png b/public/images/solstice.png
diff --git a/public/images/zeitgeist.png b/public/images/zeitgeist.png
diff --git a/src/data/siteconfig.ts b/src/data/siteconfig.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -15,7 +15,7 @@
     "jsx": "preserve",
     "baseUrl": ".",
     "paths": {
-      "@/utils/*": ["src/utils/*"],
+      "@/utils/*": ["app/utils/*"],
       "@/app/*": ["app/*"],
       "@/data/*": ["src/data/*"],
       "@/components/*": ["app/components/*"]