From 165e64951b564bb850cc75e2cb53d23673fc2be7 Mon Sep 17 00:00:00 2001 From: Irwing Naranjo Date: Tue, 2 Apr 2024 23:28:26 -0300 Subject: [PATCH 1/5] feat: add not-found page --- src/app/not-found.tsx | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 src/app/not-found.tsx diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx new file mode 100644 index 0000000..041262c --- /dev/null +++ b/src/app/not-found.tsx @@ -0,0 +1,78 @@ +/* eslint-disable tailwindcss/migration-from-tailwind-2 */ +import { Header } from "@/components/Header/Header"; +import { Mountain } from "@/components/Icons/Mountain"; +import { Particles } from "@/components/Particles"; +import { footer } from "@/lib/data"; +import { getMetaData, getViewports } from "@/lib/metadata"; +import { Link } from "@/components/Link"; +import { ChevronLeft } from "lucide-react"; + +export const generateMetadata = () => getMetaData({}); + +export const generateViewport = getViewports; + +export default function Home() { + return ( + <> +
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+

+ 404 +

+

+ La página que estás buscando no existe. +

+
+ + Volver al inicio + +
+
+
+
+
+
+ + + ); +} From 8391a87ceaad155647698e324ef13ec245ea17d3 Mon Sep 17 00:00:00 2001 From: Irwing Naranjo Date: Tue, 2 Apr 2024 23:29:20 -0300 Subject: [PATCH 2/5] feat: custom 404 page --- src/app/not-found.tsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx index 041262c..26e1381 100644 --- a/src/app/not-found.tsx +++ b/src/app/not-found.tsx @@ -35,7 +35,11 @@ export default function Home() {
+<<<<<<< Updated upstream
+======= +
+>>>>>>> Stashed changes

404

@@ -51,7 +55,11 @@ export default function Home() { Volver al inicio
+<<<<<<< Updated upstream
+======= +
+>>>>>>> Stashed changes
From a0c6c730795d1ef7056fe5def8cc2c85e4b08145 Mon Sep 17 00:00:00 2001 From: Irwing Naranjo Date: Tue, 2 Apr 2024 23:34:31 -0300 Subject: [PATCH 3/5] fix: conflicts and add correct href --- src/app/not-found.tsx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx index 26e1381..96aaf4c 100644 --- a/src/app/not-found.tsx +++ b/src/app/not-found.tsx @@ -35,11 +35,7 @@ export default function Home() {
-<<<<<<< Updated upstream
-======= -
->>>>>>> Stashed changes

404

@@ -48,18 +44,13 @@ export default function Home() {

Volver al inicio
-<<<<<<< Updated upstream -
-=======
->>>>>>> Stashed changes
From 5fcd1a65177d28cbe7c9232a8da4b51421f25954 Mon Sep 17 00:00:00 2001 From: Irwing Naranjo Date: Tue, 2 Apr 2024 23:39:19 -0300 Subject: [PATCH 4/5] refactor: add linting and code formatting fixes --- .husky/pre-commit | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.husky/pre-commit b/.husky/pre-commit index 36af219..6440a3a 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -2,3 +2,5 @@ . "$(dirname "$0")/_/husky.sh" npx lint-staged +npm run lint:fix +npm run prettier:fix From e1c5bb48a0f028f392e05bcb892f013561187b31 Mon Sep 17 00:00:00 2001 From: Irwing Naranjo Date: Tue, 2 Apr 2024 23:39:56 -0300 Subject: [PATCH 5/5] refactor: code style not-found.tsx --- src/app/not-found.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx index 96aaf4c..9855da2 100644 --- a/src/app/not-found.tsx +++ b/src/app/not-found.tsx @@ -1,11 +1,12 @@ /* eslint-disable tailwindcss/migration-from-tailwind-2 */ +import { ChevronLeft } from "lucide-react"; + import { Header } from "@/components/Header/Header"; import { Mountain } from "@/components/Icons/Mountain"; +import { Link } from "@/components/Link"; import { Particles } from "@/components/Particles"; import { footer } from "@/lib/data"; import { getMetaData, getViewports } from "@/lib/metadata"; -import { Link } from "@/components/Link"; -import { ChevronLeft } from "lucide-react"; export const generateMetadata = () => getMetaData({}); @@ -43,10 +44,7 @@ export default function Home() { La página que estás buscando no existe.

- + Volver al inicio