From 75758188eaeaf3e499fdc37dfe5601aad3c372da Mon Sep 17 00:00:00 2001 From: Dan Ott Date: Thu, 1 Jun 2023 21:18:49 -0400 Subject: [PATCH 1/9] Add pages --- app/awesome/layout.tsx | 15 +++++++++++++ app/awesome/mix/page.tsx | 17 +++++++++++++++ app/awesome/mix/vol-1/page.tsx | 15 +++++++++++++ app/awesome/mix/vol-2/page.tsx | 15 +++++++++++++ app/awesome/page.tsx | 15 +++++++++++++ app/awesome/sauce/page.tsx | 15 +++++++++++++ app/layout.tsx | 30 ++++++++++++++++++++++++++ app/page.tsx | 9 +++++--- package.json | 2 ++ pnpm-lock.yaml | 39 ++++++++++++++++++++++++++++++++++ tailwind.config.js | 4 ++-- 11 files changed, 171 insertions(+), 5 deletions(-) create mode 100644 app/awesome/layout.tsx create mode 100644 app/awesome/mix/page.tsx create mode 100644 app/awesome/mix/vol-1/page.tsx create mode 100644 app/awesome/mix/vol-2/page.tsx create mode 100644 app/awesome/page.tsx create mode 100644 app/awesome/sauce/page.tsx diff --git a/app/awesome/layout.tsx b/app/awesome/layout.tsx new file mode 100644 index 0000000..fb9be94 --- /dev/null +++ b/app/awesome/layout.tsx @@ -0,0 +1,15 @@ +export default function Layout({ children }: { children: React.ReactNode }) { + return ( +
+
+

+ Awesome things happening! +

+
+ Booya! +
+
+ {children} +
+ ); +} diff --git a/app/awesome/mix/page.tsx b/app/awesome/mix/page.tsx new file mode 100644 index 0000000..739d5cb --- /dev/null +++ b/app/awesome/mix/page.tsx @@ -0,0 +1,17 @@ +import RandomImage from '@/app/random-image'; + +export default function Home() { + return ( + <> +
+

+ I am awesome sauce! +

+
+ Awesome Sauce! +
+
+
+ + ); +} diff --git a/app/awesome/mix/vol-1/page.tsx b/app/awesome/mix/vol-1/page.tsx new file mode 100644 index 0000000..e351737 --- /dev/null +++ b/app/awesome/mix/vol-1/page.tsx @@ -0,0 +1,15 @@ +export default function Home() { + return ( + <> +
+

+ Awesome Mix Vol. 2 +

+
+ Awe yeah! +
+
+
+ + ); +} diff --git a/app/awesome/mix/vol-2/page.tsx b/app/awesome/mix/vol-2/page.tsx new file mode 100644 index 0000000..e3cc840 --- /dev/null +++ b/app/awesome/mix/vol-2/page.tsx @@ -0,0 +1,15 @@ +export default function Home() { + return ( + <> +
+

+ Awesome Mix Vol. 1 +

+
+ Woo +
+
+
+ + ); +} diff --git a/app/awesome/page.tsx b/app/awesome/page.tsx new file mode 100644 index 0000000..b1a050c --- /dev/null +++ b/app/awesome/page.tsx @@ -0,0 +1,15 @@ +export default function Home() { + return ( + <> +
+

+ I am awesome! +

+
+ Booya! +
+
+
+ + ); +} diff --git a/app/awesome/sauce/page.tsx b/app/awesome/sauce/page.tsx new file mode 100644 index 0000000..f64b18c --- /dev/null +++ b/app/awesome/sauce/page.tsx @@ -0,0 +1,15 @@ +export default function Home() { + return ( + <> +
+

+ I am awesome sauce! +

+
+ Awesome Sauce! +
+
+
+ + ); +} diff --git a/app/layout.tsx b/app/layout.tsx index 02020db..7a634e2 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,3 +1,4 @@ +import Link from 'next/link'; import './globals.css'; import { Inter } from 'next/font/google'; @@ -26,6 +27,35 @@ export default function RootLayout({
Hello!
{children} +
+ +
diff --git a/app/page.tsx b/app/page.tsx index 7b0fb91..862d3ba 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,12 +1,15 @@ export default function Home() { return ( -
+ <>

I am the home page!

-
We're home!
+
+ We're home! +
-
+
+ ); } diff --git a/package.json b/package.json index 14bced9..f23c6da 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,8 @@ "lint": "next lint" }, "dependencies": { + "@faker-js/faker": "^8.0.2", + "@tailwindcss/typography": "^0.5.9", "@types/node": "20.2.5", "@types/react": "18.2.7", "@types/react-dom": "18.2.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 79fe5ed..476e494 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,6 +5,12 @@ settings: excludeLinksFromLockfile: false dependencies: + '@faker-js/faker': + specifier: ^8.0.2 + version: 8.0.2 + '@tailwindcss/typography': + specifier: ^0.5.9 + version: 0.5.9(tailwindcss@3.3.2) '@types/node': specifier: 20.2.5 version: 20.2.5 @@ -93,6 +99,11 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: false + /@faker-js/faker@8.0.2: + resolution: {integrity: sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'} + dev: false + /@humanwhocodes/config-array@0.11.10: resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==} engines: {node: '>=10.10.0'} @@ -281,6 +292,18 @@ packages: tslib: 2.5.2 dev: false + /@tailwindcss/typography@0.5.9(tailwindcss@3.3.2): + resolution: {integrity: sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==} + peerDependencies: + tailwindcss: '>=3.0.0 || insiders' + dependencies: + lodash.castarray: 4.4.0 + lodash.isplainobject: 4.0.6 + lodash.merge: 4.6.2 + postcss-selector-parser: 6.0.10 + tailwindcss: 3.3.2 + dev: false + /@types/json5@0.0.29: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} dev: false @@ -1779,6 +1802,14 @@ packages: p-locate: 5.0.0 dev: false + /lodash.castarray@4.4.0: + resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==} + dev: false + + /lodash.isplainobject@4.0.6: + resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==} + dev: false + /lodash.merge@4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} dev: false @@ -2161,6 +2192,14 @@ packages: postcss-selector-parser: 6.0.13 dev: false + /postcss-selector-parser@6.0.10: + resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} + engines: {node: '>=4'} + dependencies: + cssesc: 3.0.0 + util-deprecate: 1.0.2 + dev: false + /postcss-selector-parser@6.0.13: resolution: {integrity: sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==} engines: {node: '>=4'} diff --git a/tailwind.config.js b/tailwind.config.js index 8c4d1b2..8672e0d 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -14,5 +14,5 @@ module.exports = { }, }, }, - plugins: [], -} + plugins: [require('@tailwindcss/typography')], +}; From 38b864289f3fa4b3d5acddb04ef9c55dac960305 Mon Sep 17 00:00:00 2001 From: Dan Ott Date: Thu, 1 Jun 2023 21:28:56 -0400 Subject: [PATCH 2/9] remove import --- app/awesome/mix/page.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/awesome/mix/page.tsx b/app/awesome/mix/page.tsx index 739d5cb..fc1e8cc 100644 --- a/app/awesome/mix/page.tsx +++ b/app/awesome/mix/page.tsx @@ -1,5 +1,3 @@ -import RandomImage from '@/app/random-image'; - export default function Home() { return ( <> From 4827551788a4f2be11994102fbe2aded581bf117 Mon Sep 17 00:00:00 2001 From: Dan Ott Date: Thu, 1 Jun 2023 21:38:29 -0400 Subject: [PATCH 3/9] Add titles --- app/awesome/mix/page.tsx | 6 +++++- app/awesome/mix/vol-1/page.tsx | 4 ++++ app/awesome/mix/vol-2/page.tsx | 4 ++++ app/awesome/page.tsx | 4 ++++ app/awesome/sauce/page.tsx | 4 ++++ app/layout.tsx | 7 +++++-- 6 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/awesome/mix/page.tsx b/app/awesome/mix/page.tsx index fc1e8cc..7561a7f 100644 --- a/app/awesome/mix/page.tsx +++ b/app/awesome/mix/page.tsx @@ -1,9 +1,13 @@ +export const metadata = { + title: 'Awesome Mixes!', +}; + export default function Home() { return ( <>

- I am awesome sauce! + Awesome Mixes!

Awesome Sauce! diff --git a/app/awesome/mix/vol-1/page.tsx b/app/awesome/mix/vol-1/page.tsx index e351737..60f5cb1 100644 --- a/app/awesome/mix/vol-1/page.tsx +++ b/app/awesome/mix/vol-1/page.tsx @@ -1,3 +1,7 @@ +export const metadata = { + title: 'Awesome Mix Vol. 2', +}; + export default function Home() { return ( <> diff --git a/app/awesome/mix/vol-2/page.tsx b/app/awesome/mix/vol-2/page.tsx index e3cc840..ab2f5a2 100644 --- a/app/awesome/mix/vol-2/page.tsx +++ b/app/awesome/mix/vol-2/page.tsx @@ -1,3 +1,7 @@ +export const metadata = { + title: 'Awesome Mix Vol. 1', +}; + export default function Home() { return ( <> diff --git a/app/awesome/page.tsx b/app/awesome/page.tsx index b1a050c..ee857eb 100644 --- a/app/awesome/page.tsx +++ b/app/awesome/page.tsx @@ -1,3 +1,7 @@ +export const metadata = { + title: 'I am awesome!', +}; + export default function Home() { return ( <> diff --git a/app/awesome/sauce/page.tsx b/app/awesome/sauce/page.tsx index f64b18c..984e943 100644 --- a/app/awesome/sauce/page.tsx +++ b/app/awesome/sauce/page.tsx @@ -1,3 +1,7 @@ +export const metadata = { + title: 'I am awesome sauce!', +}; + export default function Home() { return ( <> diff --git a/app/layout.tsx b/app/layout.tsx index 7a634e2..723c785 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -5,8 +5,11 @@ import { Inter } from 'next/font/google'; const inter = Inter({ subsets: ['latin'] }); export const metadata = { - title: 'Create Next App', - description: 'Generated by create next app', + title: { + template: '%s | Next.js App Router Example', + default: 'Home Page', + }, + description: `We're doing things!`, }; export default function RootLayout({ From 2b35e1384c6bb255fac68a5587ca4bb9ee534215 Mon Sep 17 00:00:00 2001 From: Dan Ott Date: Thu, 1 Jun 2023 22:10:02 -0400 Subject: [PATCH 4/9] rename default function --- app/awesome/mix/page.tsx | 2 +- app/awesome/mix/vol-1/page.tsx | 2 +- app/awesome/mix/vol-2/page.tsx | 2 +- app/awesome/sauce/page.tsx | 2 +- app/page.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/awesome/mix/page.tsx b/app/awesome/mix/page.tsx index 7561a7f..72c6c64 100644 --- a/app/awesome/mix/page.tsx +++ b/app/awesome/mix/page.tsx @@ -2,7 +2,7 @@ export const metadata = { title: 'Awesome Mixes!', }; -export default function Home() { +export default function Page() { return ( <>
diff --git a/app/awesome/mix/vol-1/page.tsx b/app/awesome/mix/vol-1/page.tsx index 60f5cb1..e8e4ef0 100644 --- a/app/awesome/mix/vol-1/page.tsx +++ b/app/awesome/mix/vol-1/page.tsx @@ -2,7 +2,7 @@ export const metadata = { title: 'Awesome Mix Vol. 2', }; -export default function Home() { +export default function Page() { return ( <>
diff --git a/app/awesome/mix/vol-2/page.tsx b/app/awesome/mix/vol-2/page.tsx index ab2f5a2..e04c9be 100644 --- a/app/awesome/mix/vol-2/page.tsx +++ b/app/awesome/mix/vol-2/page.tsx @@ -2,7 +2,7 @@ export const metadata = { title: 'Awesome Mix Vol. 1', }; -export default function Home() { +export default function Page() { return ( <>
diff --git a/app/awesome/sauce/page.tsx b/app/awesome/sauce/page.tsx index 984e943..b0b7e5a 100644 --- a/app/awesome/sauce/page.tsx +++ b/app/awesome/sauce/page.tsx @@ -2,7 +2,7 @@ export const metadata = { title: 'I am awesome sauce!', }; -export default function Home() { +export default function Page() { return ( <>
diff --git a/app/page.tsx b/app/page.tsx index 862d3ba..2abf9df 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,4 +1,4 @@ -export default function Home() { +export default function Page() { return ( <>
From 1aae04b34ae65f79e2920424d47d7cc227050d46 Mon Sep 17 00:00:00 2001 From: Dan Ott Date: Thu, 1 Jun 2023 22:24:33 -0400 Subject: [PATCH 5/9] Add time --- app/layout.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/layout.tsx b/app/layout.tsx index 723c785..fb9d98e 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -27,7 +27,9 @@ export default function RootLayout({ Next.js App Router Example
-
Hello!
+
+ {new Date().toLocaleTimeString()} +
{children}