From bc58b24fda644122c97e437b7d534aef6d73ed7d Mon Sep 17 00:00:00 2001 From: guusvanmeerveld Date: Thu, 27 May 2021 15:22:42 +0100 Subject: [PATCH] Moved a few components to home page. --- next.config.js | 3 +++ src/components/Landing.tsx | 21 ------------------ src/components/Page.tsx | 2 +- src/components/Project.tsx | 4 ++-- src/components/Projects.tsx | 20 ----------------- src/pages/index.tsx | 43 +++++++++++++++++++++++++++++++------ 6 files changed, 43 insertions(+), 50 deletions(-) create mode 100644 next.config.js delete mode 100644 src/components/Landing.tsx delete mode 100644 src/components/Projects.tsx diff --git a/next.config.js b/next.config.js new file mode 100644 index 0000000..8532c63 --- /dev/null +++ b/next.config.js @@ -0,0 +1,3 @@ +module.export = { + basePath: '/' +} \ No newline at end of file diff --git a/src/components/Landing.tsx b/src/components/Landing.tsx deleted file mode 100644 index cccea87..0000000 --- a/src/components/Landing.tsx +++ /dev/null @@ -1,21 +0,0 @@ -const Landing = () => ( -
-
- - - - - Guus van Meerveld - - TypeScript / Dart developer,
- currently working on Argo. -
- - - Check out my projects - -
-
-); - -export default Landing; diff --git a/src/components/Page.tsx b/src/components/Page.tsx index bc3a8d9..d21ea2e 100644 --- a/src/components/Page.tsx +++ b/src/components/Page.tsx @@ -14,7 +14,7 @@ const Page = ({ - G-VM | {title} + Guus van Meerveld | {title} diff --git a/src/components/Project.tsx b/src/components/Project.tsx index 97ca611..ca024f4 100644 --- a/src/components/Project.tsx +++ b/src/components/Project.tsx @@ -11,8 +11,8 @@ const Project: FC = ({ name, description, buttons, cover, right }) {description}

- {buttons.map((button) => ( - + {buttons.map((button, i) => ( + {button.text} ))} diff --git a/src/components/Projects.tsx b/src/components/Projects.tsx deleted file mode 100644 index 282cb4e..0000000 --- a/src/components/Projects.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import { NextPage } from 'next'; - -import Project from '@components/Project'; -import projects from '@config/projects.json'; - -const Projects: NextPage = () => ( -
-
-
- Projects -
- - {projects.map((project) => ( - - ))} -
-
-); - -export default Projects; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index a272050..4db562c 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,14 +1,45 @@ -import Projects from '@components/Projects'; -import Landing from '@components/Landing'; +import { NextPage } from 'next'; + import Contact from '@components/Contact'; import Layout from '@components/Layout'; import Page from '@components/Page'; -const Home = () => ( - +import Project from '@components/Project'; +import projects from '@config/projects.json'; + +const Home: NextPage = () => ( + - - +
+
+ + + + + Guus van Meerveld + + TypeScript / Dart developer,
+ currently working on Argo. +
+ + + Check out my projects + +
+
+ +
+
+
+ Projects +
+ + {projects.map((project) => ( + + ))} +
+
+