From 536e0f9c3a5e3438c9dba422277d9b4c913036ea Mon Sep 17 00:00:00 2001 From: Evi Date: Sat, 14 Dec 2024 17:20:23 +0100 Subject: [PATCH 1/3] fix(Layout): using a layout to improve visual design --- app/about-me/page.tsx | 2 +- app/components/Header.tsx | 4 +-- app/components/NavList.tsx | 8 +++-- app/gallery/page.tsx | 4 +-- app/layout.tsx | 6 ++-- app/nl-NL/about-me/page.tsx | 2 +- app/nl-NL/gallery/page.tsx | 2 +- app/nl-NL/layout.tsx | 4 +-- app/nl-NL/page.tsx | 6 ++-- app/nl-NL/projects/[slug]/page.tsx | 7 ++-- app/nl-NL/projects/page.tsx | 7 ++-- app/nl-NL/work-experience/page.tsx | 6 ++-- app/page.tsx | 4 +-- app/projects/[slug]/page.tsx | 7 ++-- app/projects/page.tsx | 7 ++-- app/work-experience/page.tsx | 6 ++-- next.config.js | 2 +- yarn.lock | 58 +++++++++++++++++++++++++----- 18 files changed, 89 insertions(+), 53 deletions(-) diff --git a/app/about-me/page.tsx b/app/about-me/page.tsx index 5bec9474..fa0d2fd8 100755 --- a/app/about-me/page.tsx +++ b/app/about-me/page.tsx @@ -64,7 +64,7 @@ export default async function overMij() { const getData = await getOverMij('en'); const data = getData.overMij; return ( -
+

{data.titelOverMijPagina}

{data.subtitel}

{ const { allPaginas } = await getNavItems(lngFormatted); return ( -
+
@@ -46,7 +46,7 @@ const Header = async ({ lng }: { lng: string }) => {
+ ); } diff --git a/app/nl-NL/projects/[slug]/page.tsx b/app/nl-NL/projects/[slug]/page.tsx index ff7c16ae..826b184a 100755 --- a/app/nl-NL/projects/[slug]/page.tsx +++ b/app/nl-NL/projects/[slug]/page.tsx @@ -117,10 +117,7 @@ export default async function Projecten(props: { params: Promise<{ slug: string; const data = getData.projecten; return ( -
+
Projecten @@ -162,6 +159,6 @@ export default async function Projecten(props: { params: Promise<{ slug: string; >
-
+ ); } diff --git a/app/nl-NL/projects/page.tsx b/app/nl-NL/projects/page.tsx index a59d2312..8d94a65b 100755 --- a/app/nl-NL/projects/page.tsx +++ b/app/nl-NL/projects/page.tsx @@ -85,9 +85,8 @@ export default async function Projecten() { const data = getData.allProjectens; return ( -

{pagina.label} @@ -167,6 +166,6 @@ export default async function Projecten() { ), )} -

+ ); } diff --git a/app/nl-NL/work-experience/page.tsx b/app/nl-NL/work-experience/page.tsx index 25fff13e..cdce8f19 100755 --- a/app/nl-NL/work-experience/page.tsx +++ b/app/nl-NL/work-experience/page.tsx @@ -71,9 +71,9 @@ export default async function Werkervaring() { const { pagina } = await getSeoData('nl'); return ( -
+

{pagina.label}

-
+
    {data.map( (element: { @@ -144,6 +144,6 @@ export default async function Werkervaring() { )}
-
+ ); } diff --git a/app/page.tsx b/app/page.tsx index 963f8aa2..7e199201 100755 --- a/app/page.tsx +++ b/app/page.tsx @@ -82,11 +82,11 @@ export default async function Home() { const data = getData.overMij; return ( -
+

{data.heading}

{data.functie}

-
+
diff --git a/app/projects/[slug]/page.tsx b/app/projects/[slug]/page.tsx index 9b81f2b7..832c0e5d 100755 --- a/app/projects/[slug]/page.tsx +++ b/app/projects/[slug]/page.tsx @@ -117,10 +117,7 @@ export default async function Projecten(props: { params: Promise<{ slug: string const data = getData.projecten; return ( -
+
Projects @@ -162,6 +159,6 @@ export default async function Projecten(props: { params: Promise<{ slug: string >
-
+
); } diff --git a/app/projects/page.tsx b/app/projects/page.tsx index 43ca4302..adf8d149 100755 --- a/app/projects/page.tsx +++ b/app/projects/page.tsx @@ -85,9 +85,8 @@ export default async function Projecten() { const data = getData.allProjectens; return ( -

{pagina.label} @@ -167,6 +166,6 @@ export default async function Projecten() { ), )} -

+ ); } diff --git a/app/work-experience/page.tsx b/app/work-experience/page.tsx index c520d567..3c23a1a6 100755 --- a/app/work-experience/page.tsx +++ b/app/work-experience/page.tsx @@ -71,9 +71,9 @@ export default async function Werkervaring() { const { pagina } = await getSeoData('en'); return ( -
+

{pagina.label}

-
+
    {data.map( (element: { @@ -144,6 +144,6 @@ export default async function Werkervaring() { )}
-
+ ); } diff --git a/next.config.js b/next.config.js index bcdea9c0..7b665a57 100755 --- a/next.config.js +++ b/next.config.js @@ -1,5 +1,5 @@ module.exports = { - output: 'export', + // output: 'export', images: { remotePatterns: [ { diff --git a/yarn.lock b/yarn.lock index ea556ea3..3bbbb015 100755 --- a/yarn.lock +++ b/yarn.lock @@ -731,15 +731,15 @@ "@typescript-eslint/visitor-keys" "7.2.0" debug "^4.3.4" -"@typescript-eslint/parser@^7.0.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0" - integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg== - dependencies: - "@typescript-eslint/scope-manager" "7.18.0" - "@typescript-eslint/types" "7.18.0" - "@typescript-eslint/typescript-estree" "7.18.0" - "@typescript-eslint/visitor-keys" "7.18.0" +"@typescript-eslint/parser@^8.10.0": + version "8.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.18.0.tgz#a1c9456cbb6a089730bf1d3fc47946c5fb5fe67b" + integrity sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q== + dependencies: + "@typescript-eslint/scope-manager" "8.18.0" + "@typescript-eslint/types" "8.18.0" + "@typescript-eslint/typescript-estree" "8.18.0" + "@typescript-eslint/visitor-keys" "8.18.0" debug "^4.3.4" "@typescript-eslint/scope-manager@7.18.0": @@ -758,6 +758,14 @@ "@typescript-eslint/types" "7.2.0" "@typescript-eslint/visitor-keys" "7.2.0" +"@typescript-eslint/scope-manager@8.18.0": + version "8.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz#30b040cb4557804a7e2bcc65cf8fdb630c96546f" + integrity sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw== + dependencies: + "@typescript-eslint/types" "8.18.0" + "@typescript-eslint/visitor-keys" "8.18.0" + "@typescript-eslint/type-utils@7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b" @@ -778,6 +786,11 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f" integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA== +"@typescript-eslint/types@8.18.0": + version "8.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.18.0.tgz#3afcd30def8756bc78541268ea819a043221d5f3" + integrity sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA== + "@typescript-eslint/typescript-estree@7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931" @@ -806,6 +819,20 @@ semver "^7.5.4" ts-api-utils "^1.0.1" +"@typescript-eslint/typescript-estree@8.18.0": + version "8.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz#d8ca785799fbb9c700cdff1a79c046c3e633c7f9" + integrity sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg== + dependencies: + "@typescript-eslint/types" "8.18.0" + "@typescript-eslint/visitor-keys" "8.18.0" + debug "^4.3.4" + fast-glob "^3.3.2" + is-glob "^4.0.3" + minimatch "^9.0.4" + semver "^7.6.0" + ts-api-utils "^1.3.0" + "@typescript-eslint/utils@7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f" @@ -832,6 +859,14 @@ "@typescript-eslint/types" "7.2.0" eslint-visitor-keys "^3.4.1" +"@typescript-eslint/visitor-keys@8.18.0": + version "8.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz#7b6d33534fa808e33a19951907231ad2ea5c36dd" + integrity sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw== + dependencies: + "@typescript-eslint/types" "8.18.0" + eslint-visitor-keys "^4.2.0" + "@u3u/prettier-config@^5.1.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@u3u/prettier-config/-/prettier-config-5.1.0.tgz#c6a91a99bda6c086056314355689ac5fd48a2691" @@ -1905,6 +1940,11 @@ eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== +eslint-visitor-keys@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45" + integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw== + eslint@^8: version "8.57.1" resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9" From e33bf8125e0a3d7dce31aa03b1f2c350f5c30d9a Mon Sep 17 00:00:00 2001 From: Evi Date: Sat, 14 Dec 2024 17:27:49 +0100 Subject: [PATCH 2/3] fix build --- app/components/Header.tsx | 2 +- app/layout.tsx | 2 +- app/nl-NL/layout.tsx | 2 +- app/page.tsx | 6 +++--- next.config.js | 2 +- tailwind.config.ts | 3 +++ 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/components/Header.tsx b/app/components/Header.tsx index 4be7f52f..785b1b71 100755 --- a/app/components/Header.tsx +++ b/app/components/Header.tsx @@ -36,7 +36,7 @@ const Header = async ({ lng }: { lng: string }) => { const { allPaginas } = await getNavItems(lngFormatted); return ( -
+
diff --git a/app/layout.tsx b/app/layout.tsx index 30bdb970..a115e14d 100755 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -26,7 +26,7 @@ export default async function RootLayout( md:px-3 dark:from-neutral-900 dark:to-neutral-950 ${GeistSans.className}`} >
-
{children}
+
{children}
diff --git a/app/nl-NL/layout.tsx b/app/nl-NL/layout.tsx index dc3b6063..604d8af8 100755 --- a/app/nl-NL/layout.tsx +++ b/app/nl-NL/layout.tsx @@ -26,7 +26,7 @@ export default async function RootLayout( dark:from-neutral-900 dark:to-neutral-950 ${GeistSans.className}`} >
-
{children}
+
{children}
diff --git a/app/page.tsx b/app/page.tsx index 7e199201..74f2c8ec 100755 --- a/app/page.tsx +++ b/app/page.tsx @@ -82,11 +82,11 @@ export default async function Home() { const data = getData.overMij; return ( -
+

{data.heading}

{data.functie}

-
+
@@ -132,6 +132,6 @@ export default async function Home() { -
+ ); } diff --git a/next.config.js b/next.config.js index 7b665a57..bcdea9c0 100755 --- a/next.config.js +++ b/next.config.js @@ -1,5 +1,5 @@ module.exports = { - // output: 'export', + output: 'export', images: { remotePatterns: [ { diff --git a/tailwind.config.ts b/tailwind.config.ts index 8b670301..b818cdf6 100755 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -13,6 +13,9 @@ const config: Config = { 'gradient-radial': 'radial-gradient(var(--tw-gradient-stops))', 'gradient-conic': 'conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))', }, + maxWidth: { + screen: '960px', + }, }, }, plugins: [], From 65728479c507280fab5d93ea19361bd5adf4f403 Mon Sep 17 00:00:00 2001 From: Evi Date: Sat, 14 Dec 2024 17:30:12 +0100 Subject: [PATCH 3/3] fix: layout --- app/layout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/layout.tsx b/app/layout.tsx index a115e14d..b7e45a71 100755 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -26,7 +26,7 @@ export default async function RootLayout( md:px-3 dark:from-neutral-900 dark:to-neutral-950 ${GeistSans.className}`} >
-
{children}
+
{children}