From a81c1f0a43e3b839f29fa77783ea7837b9e6654b Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Tue, 21 Nov 2023 07:18:48 +0100 Subject: [PATCH] Updates --- Dockerfile | 2 +- app/blog/page.tsx | 38 +++++++++++------ package-lock.json | 105 ++++++++++++++++++++++++++++++++++++++++++---- package.json | 2 +- 4 files changed, 125 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 843af9c..8798090 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,4 +29,4 @@ RUN npm run build # RUN ssh-add ./.ssh/github # Run the app -CMD ["nodecid"] \ No newline at end of file +CMD ["npm", "start"] \ No newline at end of file diff --git a/app/blog/page.tsx b/app/blog/page.tsx index 2ac4215..bf660c1 100644 --- a/app/blog/page.tsx +++ b/app/blog/page.tsx @@ -27,7 +27,7 @@ export default async function BlogIndex() { //* Data fetching ///////////////////////////////////////////// const postsResponse = await datasquirel.get({ - key: process.env.DATASQUIREL_API_KEY, + key: process.env.DSQL_API_KEY, db: process.env.DB_NAME, query: "select title,slug,excerpt,date_created from blog_posts limit 10", }); @@ -52,17 +52,31 @@ export default async function BlogIndex() {

My Blog

- {posts.map((post: { slug: string; title: string; excerpt: string; date_created: string }, index: number) => ( - -

{post.title}

- {post.excerpt} - {post.date_created.substring(0, 24)} - - ))} + {posts.map( + ( + post: { + slug: string; + title: string; + excerpt: string; + date_created: string; + }, + index: number + ) => ( + +

{post.title}

+ + {post.excerpt} + + + {post.date_created.substring(0, 24)} + + + ) + )}
diff --git a/package-lock.json b/package-lock.json index 24173a0..4ef941a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@barba/core": "^2.9.7", "contentful": "^9.1.32", "cors": "^2.8.5", - "datasquirel": "^1.1.82", + "datasquirel": "^1.9.5", "gsap": "^3.10.4", "next": "^13.4.10", "nodemailer": "^6.7.2", @@ -413,6 +413,14 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "node_modules/bignumber.js": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz", + "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==", + "engines": { + "node": "*" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -640,6 +648,11 @@ "node": ">=12" } }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, "node_modules/cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", @@ -671,9 +684,17 @@ "dev": true }, "node_modules/datasquirel": { - "version": "1.1.82", - "resolved": "https://registry.npmjs.org/datasquirel/-/datasquirel-1.1.82.tgz", - "integrity": "sha512-SOkoURo7GDAfmyquVJLHzwkuMQ5Gq9GjPFX0RderX3wZb66YNQyMvEc/bpI5w/2XQpEpYln2ru8+JA+OFegx5Q==" + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/datasquirel/-/datasquirel-1.9.5.tgz", + "integrity": "sha512-amwo9ne83rhSKpkqlS6zDcm/Oi/CggF4NGqhWLk/36arKv0x+XziAmW6/zTeB5zL7VZOcBFnAjYnR9ir2Kth7A==", + "dependencies": { + "dotenv": "^16.3.1", + "mysql": "^2.18.1" + }, + "bin": { + "dsql-dump": "engine/dump.js", + "dsql-watch": "engine/dsql.js" + } }, "node_modules/deepmerge": { "version": "4.3.1", @@ -754,6 +775,17 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/dotenv": { + "version": "16.3.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", + "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, "node_modules/electron-to-chromium": { "version": "1.4.466", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.466.tgz", @@ -1040,8 +1072,7 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/is-binary-path": { "version": "2.1.0", @@ -1110,6 +1141,11 @@ "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, "node_modules/jiti": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz", @@ -1218,6 +1254,20 @@ "node": "*" } }, + "node_modules/mysql": { + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz", + "integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==", + "dependencies": { + "bignumber.js": "9.0.0", + "readable-stream": "2.3.7", + "safe-buffer": "5.1.2", + "sqlstring": "2.3.1" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", @@ -1538,6 +1588,11 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, "node_modules/qs": { "version": "6.11.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", @@ -1604,6 +1659,20 @@ "pify": "^2.3.0" } }, + "node_modules/readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -1666,6 +1735,11 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, "node_modules/sanitize-html": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.11.0.tgz", @@ -1708,6 +1782,14 @@ "node": ">=0.10.0" } }, + "node_modules/sqlstring": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz", + "integrity": "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -1716,6 +1798,14 @@ "node": ">=10.0.0" } }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, "node_modules/styled-jsx": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz", @@ -1952,8 +2042,7 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/vary": { "version": "1.1.2", diff --git a/package.json b/package.json index 514d1ed..6e8244c 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@barba/core": "^2.9.7", "contentful": "^9.1.32", "cors": "^2.8.5", - "datasquirel": "^1.1.82", + "datasquirel": "^1.9.5", "gsap": "^3.10.4", "next": "^13.4.10", "nodemailer": "^6.7.2",