Deployment Test

Update docker healthcheck route
Add docker healthcheck route
2024-10-05 12:11:28 +01:00 · 2024-10-04 21:46:06 +01:00 · 2024-10-04 21:43:03 +01:00 · 2024-10-01 16:22:49 +01:00 · 2024-10-01 16:20:22 +01:00 · 2024-10-01 16:17:51 +01:00
10 changed files with 270 additions and 210 deletions
--- a/16
+++ b/16
@ -1,5 +1,5 @@
 # Set Node.js version
-FROM node:alpine
+FROM node:20-alpine

 RUN mkdir /app

@ -9,25 +9,17 @@ WORKDIR /app
 # Copy package.json and package-lock.json

 RUN apk update
-RUN apk add git bash nano
+RUN apk add nano

 RUN touch /root/.bashrc
 RUN echo 'alias ll="ls -laF"' > /root/.bashrc

-# Clone Repository
-RUN git clone https://github.com/BenjaminToby/personal_site.git .
-
-COPY .env .
+COPY . /app/.

 # Install dependencies
 RUN npm install
-RUN npm install -g nodecid

 RUN npm run build

-# RUN chmod 600 /app/.ssh/github
-# RUN eval $(ssh-agent)
-# RUN ssh-add ./.ssh/github
-
 # Run the app
-CMD ["nodecid"]
+CMD ["npm", "start"]
--- a/Dockerfile.deprecated
+++ b/Dockerfile.deprecated
@ -0,0 +1,33 @@
+# Set Node.js version
+FROM node:alpine
+
+RUN mkdir /app
+
+# Set working directory
+WORKDIR /app
+
+# Copy package.json and package-lock.json
+
+RUN apk update
+RUN apk add git bash nano
+
+RUN touch /root/.bashrc
+RUN echo 'alias ll="ls -laF"' > /root/.bashrc
+
+# Clone Repository
+RUN git clone https://github.com/BenjaminToby/personal_site.git .
+
+COPY .env .
+
+# Install dependencies
+RUN npm install
+RUN npm install -g nodecid
+
+RUN npm run build
+
+# RUN chmod 600 /app/.ssh/github
+# RUN eval $(ssh-agent)
+# RUN ssh-add ./.ssh/github
+
+# Run the app
+CMD ["nodecid"]
--- a/2
+++ b/2
@ -1 +1 @@
-aswd10983hbqwdc
+564sdfw234
--- a/app/blog/[single]/page.tsx
+++ b/app/blog/[single]/page.tsx
@ -56,20 +56,24 @@ export default async function BlogIndex({
 }: {
    params: any;
 }) {
-    //* Data fetching
-    const post = await getPost({ single: single });
+    try {
+        //* Data fetching
+        const post = await getPost({ single: single });

-    if (!post) {
+        if (!post) {
+            return redirect("/blog");
+        }
+
+        //* Main Function Return
+        /////////////////////////////////////////////
+        return (
+            <React.Fragment>
+                <Main post={post} />
+            </React.Fragment>
+        );
+
+        /** ********************************************** */
+    } catch (error) {
        return redirect("/blog");
    }
-
-    //* Main Function Return
-    /////////////////////////////////////////////
-    return (
-        <React.Fragment>
-            <Main post={post} />
-        </React.Fragment>
-    );
-
-    /** ********************************************** */
 }
--- a/app/blog/page.tsx
+++ b/app/blog/page.tsx
@ -4,8 +4,7 @@
 import React from "react";
 import { Metadata } from "next";
 const datasquirel = require("datasquirel");
-
-import { headers, cookies } from "next/headers";
+import { redirect } from "next/navigation";

 /////////////////////////////////////////////
 //* Metadata
@ -26,52 +25,56 @@ export const revalidate = 3600;
 * ==============================================================================
 */
 export default async function BlogIndex() {
-    //* Data fetching
-    /////////////////////////////////////////////
-    const postsResponse = await datasquirel.get({
-        key: process.env.DATASQUIREL_API_KEY,
-        db: process.env.DB_NAME,
-        query: "select title,slug,excerpt,date_created from blog_posts limit 10",
-    });
+    try {
+        //* Data fetching
+        /////////////////////////////////////////////
+        const postsResponse = await datasquirel.get({
+            key: process.env.DATASQUIREL_API_KEY,
+            db: process.env.DB_NAME,
+            query: "select title,slug,excerpt,date_created from blog_posts limit 10",
+        });

-    const posts = postsResponse?.success ? postsResponse.payload : [];
+        const posts = postsResponse?.success ? postsResponse.payload : [];

-    //* Main Function Return
-    /////////////////////////////////////////////
-    return (
-        <React.Fragment>
-            <div className="flex flex-col items-start max-w-6xl w-full">
-                <h1 className="mb-8">My Blog</h1>
-                <div className="flex flex-col items-start w-full gap-4">
-                    {posts.map(
-                        (
-                            post: {
-                                slug: string;
-                                title: string;
-                                excerpt: string;
-                                date_created: string;
-                            },
-                            index: number
-                        ) => (
-                            <a
-                                key={index}
-                                href={`/blog/${post.slug}`}
-                                className="flex flex-col items-start gap-2 w-full hover:bg-blue-600 border border-solid border-white/20 p-8 transition-all bg-primary/10"
-                            >
-                                <h2 className="m-0">{post.title}</h2>
-                                <span className="opacity-80">
-                                    {post.excerpt}
-                                </span>
-                                <span className="text-sm opacity-50">
-                                    {post.date_created.substring(0, 24)}
-                                </span>
-                            </a>
-                        )
-                    )}
+        //* Main Function Return
+        /////////////////////////////////////////////
+        return (
+            <React.Fragment>
+                <div className="flex flex-col items-start max-w-6xl w-full">
+                    <h1 className="mb-8">My Blog</h1>
+                    <div className="flex flex-col items-start w-full gap-4">
+                        {posts.map(
+                            (
+                                post: {
+                                    slug: string;
+                                    title: string;
+                                    excerpt: string;
+                                    date_created: string;
+                                },
+                                index: number
+                            ) => (
+                                <a
+                                    key={index}
+                                    href={`/blog/${post.slug}`}
+                                    className="flex flex-col items-start gap-2 w-full hover:bg-blue-600 border border-solid border-white/20 p-8 transition-all bg-primary/10"
+                                >
+                                    <h2 className="m-0">{post.title}</h2>
+                                    <span className="opacity-80">
+                                        {post.excerpt}
+                                    </span>
+                                    <span className="text-sm opacity-50">
+                                        {post.date_created.substring(0, 24)}
+                                    </span>
+                                </a>
+                            )
+                        )}
+                    </div>
                </div>
-            </div>
-        </React.Fragment>
-    );
+            </React.Fragment>
+        );

-    /** ********************************************** */
+        /** ********************************************** */
+    } catch (error) {
+        return redirect("/");
+    }
 }
--- a/components/portfolioEntries.json
+++ b/components/portfolioEntries.json
@ -4,13 +4,14 @@
        "description": "Datasquirel is a fast and efficient cloud-based SQL data management system",
        "url": "https://datasquirel.com",
        "image": "/images/datasquirel-img.jpg"
-    },    
+    },
    {
        "title": "Summit Lending",
        "description": "Summit Lending is a mortgage broker offering competitive rates for home loans of all sorts",
        "url": "https://summitlending.com",
        "image": "/images/summit-lending.jpg"
-    }, {
+    },
+    {
        "title": "Coderank",
        "description": "The New era of Talent acquisition and Remote work.",
        "url": "https://coderank.net/",
@ -21,11 +22,5 @@
        "description": "Ecommerce platform for selling gym wears",
        "url": "https://fitness-ecommerce.vercel.app/",
        "image": "/images/Base-Fitness-Screenshot.webp"
-    },
-    {
-        "title": "Homeruntoken",
-        "description": "Real Estate Investing Made Easy",
-        "url": "https://homeruntoken.vercel.app/",
-        "image": "/images/Homeruntoken-graphic.jpg"
    }
 ]
--- a/package-lock.json
+++ b/package-lock.json
@ -13,10 +13,10 @@
                "cors": "^2.8.5",
                "datasquirel": "^1.9.5",
                "gsap": "^3.10.4",
-                "next": "^13.4.10",
+                "next": "^14.2.13",
                "nodemailer": "^6.7.2",
-                "react": "^18.2.0",
-                "react-dom": "^18.2.0",
+                "react": "^18.3.1",
+                "react-dom": "^18.3.1",
                "sanitize-html": "^2.11.0",
                "three": "^0.138.3"
            },
@ -117,17 +117,19 @@
            }
        },
        "node_modules/@next/env": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz",
-            "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw=="
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.13.tgz",
+            "integrity": "sha512-s3lh6K8cbW1h5Nga7NNeXrbe0+2jIIYK9YaA9T7IufDWnZpozdFUp6Hf0d5rNWUKu4fEuSX2rCKlGjCrtylfDw==",
+            "license": "MIT"
        },
        "node_modules/@next/swc-darwin-arm64": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz",
-            "integrity": "sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.13.tgz",
+            "integrity": "sha512-IkAmQEa2Htq+wHACBxOsslt+jMoV3msvxCn0WFSfJSkv/scy+i/EukBKNad36grRxywaXUYJc9mxEGkeIs8Bzg==",
            "cpu": [
                "arm64"
            ],
+            "license": "MIT",
            "optional": true,
            "os": [
                "darwin"
@ -137,12 +139,13 @@
            }
        },
        "node_modules/@next/swc-darwin-x64": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz",
-            "integrity": "sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.13.tgz",
+            "integrity": "sha512-Dv1RBGs2TTjkwEnFMVL5XIfJEavnLqqwYSD6LXgTPdEy/u6FlSrLBSSfe1pcfqhFEXRAgVL3Wpjibe5wXJzWog==",
            "cpu": [
                "x64"
            ],
+            "license": "MIT",
            "optional": true,
            "os": [
                "darwin"
@ -152,12 +155,13 @@
            }
        },
        "node_modules/@next/swc-linux-arm64-gnu": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz",
-            "integrity": "sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.13.tgz",
+            "integrity": "sha512-yB1tYEFFqo4ZNWkwrJultbsw7NPAAxlPXURXioRl9SdW6aIefOLS+0TEsKrWBtbJ9moTDgU3HRILL6QBQnMevg==",
            "cpu": [
                "arm64"
            ],
+            "license": "MIT",
            "optional": true,
            "os": [
                "linux"
@ -167,12 +171,13 @@
            }
        },
        "node_modules/@next/swc-linux-arm64-musl": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz",
-            "integrity": "sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.13.tgz",
+            "integrity": "sha512-v5jZ/FV/eHGoWhMKYrsAweQ7CWb8xsWGM/8m1mwwZQ/sutJjoFaXchwK4pX8NqwImILEvQmZWyb8pPTcP7htWg==",
            "cpu": [
                "arm64"
            ],
+            "license": "MIT",
            "optional": true,
            "os": [
                "linux"
@ -182,12 +187,13 @@
            }
        },
        "node_modules/@next/swc-linux-x64-gnu": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz",
-            "integrity": "sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.13.tgz",
+            "integrity": "sha512-aVc7m4YL7ViiRv7SOXK3RplXzOEe/qQzRA5R2vpXboHABs3w8vtFslGTz+5tKiQzWUmTmBNVW0UQdhkKRORmGA==",
            "cpu": [
                "x64"
            ],
+            "license": "MIT",
            "optional": true,
            "os": [
                "linux"
@ -197,12 +203,13 @@
            }
        },
        "node_modules/@next/swc-linux-x64-musl": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz",
-            "integrity": "sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.13.tgz",
+            "integrity": "sha512-4wWY7/OsSaJOOKvMsu1Teylku7vKyTuocvDLTZQq0TYv9OjiYYWt63PiE1nTuZnqQ4RPvME7Xai+9enoiN0Wrg==",
            "cpu": [
                "x64"
            ],
+            "license": "MIT",
            "optional": true,
            "os": [
                "linux"
@ -212,12 +219,13 @@
            }
        },
        "node_modules/@next/swc-win32-arm64-msvc": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz",
-            "integrity": "sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.13.tgz",
+            "integrity": "sha512-uP1XkqCqV2NVH9+g2sC7qIw+w2tRbcMiXFEbMihkQ8B1+V6m28sshBwAB0SDmOe0u44ne1vFU66+gx/28RsBVQ==",
            "cpu": [
                "arm64"
            ],
+            "license": "MIT",
            "optional": true,
            "os": [
                "win32"
@ -227,12 +235,13 @@
            }
        },
        "node_modules/@next/swc-win32-ia32-msvc": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz",
-            "integrity": "sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.13.tgz",
+            "integrity": "sha512-V26ezyjPqQpDBV4lcWIh8B/QICQ4v+M5Bo9ykLN+sqeKKBxJVDpEc6biDVyluTXTC40f5IqCU0ttth7Es2ZuMw==",
            "cpu": [
                "ia32"
            ],
+            "license": "MIT",
            "optional": true,
            "os": [
                "win32"
@ -242,12 +251,13 @@
            }
        },
        "node_modules/@next/swc-win32-x64-msvc": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz",
-            "integrity": "sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.13.tgz",
+            "integrity": "sha512-WwzOEAFBGhlDHE5Z73mNU8CO8mqMNLqaG+AO9ETmzdCQlJhVtWZnOl2+rqgVQS+YHunjOWptdFmNfbpwcUuEsw==",
            "cpu": [
                "x64"
            ],
+            "license": "MIT",
            "optional": true,
            "os": [
                "win32"
@ -301,11 +311,19 @@
                "node": ">=14"
            }
        },
+        "node_modules/@swc/counter": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+            "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+            "license": "Apache-2.0"
+        },
        "node_modules/@swc/helpers": {
-            "version": "0.5.2",
-            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz",
-            "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==",
+            "version": "0.5.5",
+            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz",
+            "integrity": "sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==",
+            "license": "Apache-2.0",
            "dependencies": {
+                "@swc/counter": "^0.1.3",
                "tslib": "^2.4.0"
            }
        },
@ -469,12 +487,13 @@
            }
        },
        "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
-                "fill-range": "^7.0.1"
+                "fill-range": "^7.1.1"
            },
            "engines": {
                "node": ">=8"
@ -533,9 +552,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001572",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001572.tgz",
-            "integrity": "sha512-1Pbh5FLmn5y4+QhNyJE9j3/7dK44dGB83/ZMjv/qJk86TvDbjk0LosiZo0i0WB0Vx607qMX9jYrn1VLHCkN4rw==",
+            "version": "1.0.30001664",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
+            "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
            "funding": [
                {
                    "type": "opencollective",
@ -549,7 +568,8 @@
                    "type": "github",
                    "url": "https://github.com/sponsors/ai"
                }
-            ]
+            ],
+            "license": "CC-BY-4.0"
        },
        "node_modules/chokidar": {
            "version": "3.5.3",
@ -853,10 +873,11 @@
            }
        },
        "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "to-regex-range": "^5.0.1"
            },
@ -950,15 +971,11 @@
                "node": ">=10.13.0"
            }
        },
-        "node_modules/glob-to-regexp": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-            "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-        },
        "node_modules/graceful-fs": {
            "version": "4.2.11",
            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+            "license": "ISC"
        },
        "node_modules/gsap": {
            "version": "3.12.4",
@ -1059,6 +1076,7 @@
            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">=0.12.0"
            }
@ -1164,12 +1182,13 @@
            }
        },
        "node_modules/micromatch": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
-                "braces": "^3.0.2",
+                "braces": "^3.0.3",
                "picomatch": "^2.3.1"
            },
            "engines": {
@ -1243,37 +1262,39 @@
            }
        },
        "node_modules/next": {
-            "version": "13.5.6",
-            "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz",
-            "integrity": "sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==",
+            "version": "14.2.13",
+            "resolved": "https://registry.npmjs.org/next/-/next-14.2.13.tgz",
+            "integrity": "sha512-BseY9YNw8QJSwLYD7hlZzl6QVDoSFHL/URN5K64kVEVpCsSOWeyjbIGK+dZUaRViHTaMQX8aqmnn0PHBbGZezg==",
+            "license": "MIT",
            "dependencies": {
-                "@next/env": "13.5.6",
-                "@swc/helpers": "0.5.2",
+                "@next/env": "14.2.13",
+                "@swc/helpers": "0.5.5",
                "busboy": "1.6.0",
-                "caniuse-lite": "^1.0.30001406",
+                "caniuse-lite": "^1.0.30001579",
+                "graceful-fs": "^4.2.11",
                "postcss": "8.4.31",
-                "styled-jsx": "5.1.1",
-                "watchpack": "2.4.0"
+                "styled-jsx": "5.1.1"
            },
            "bin": {
                "next": "dist/bin/next"
            },
            "engines": {
-                "node": ">=16.14.0"
+                "node": ">=18.17.0"
            },
            "optionalDependencies": {
-                "@next/swc-darwin-arm64": "13.5.6",
-                "@next/swc-darwin-x64": "13.5.6",
-                "@next/swc-linux-arm64-gnu": "13.5.6",
-                "@next/swc-linux-arm64-musl": "13.5.6",
-                "@next/swc-linux-x64-gnu": "13.5.6",
-                "@next/swc-linux-x64-musl": "13.5.6",
-                "@next/swc-win32-arm64-msvc": "13.5.6",
-                "@next/swc-win32-ia32-msvc": "13.5.6",
-                "@next/swc-win32-x64-msvc": "13.5.6"
+                "@next/swc-darwin-arm64": "14.2.13",
+                "@next/swc-darwin-x64": "14.2.13",
+                "@next/swc-linux-arm64-gnu": "14.2.13",
+                "@next/swc-linux-arm64-musl": "14.2.13",
+                "@next/swc-linux-x64-gnu": "14.2.13",
+                "@next/swc-linux-x64-musl": "14.2.13",
+                "@next/swc-win32-arm64-msvc": "14.2.13",
+                "@next/swc-win32-ia32-msvc": "14.2.13",
+                "@next/swc-win32-x64-msvc": "14.2.13"
            },
            "peerDependencies": {
                "@opentelemetry/api": "^1.1.0",
+                "@playwright/test": "^1.41.2",
                "react": "^18.2.0",
                "react-dom": "^18.2.0",
                "sass": "^1.3.0"
@ -1282,6 +1303,9 @@
                "@opentelemetry/api": {
                    "optional": true
                },
+                "@playwright/test": {
+                    "optional": true
+                },
                "sass": {
                    "optional": true
                }
@ -1321,9 +1345,10 @@
            "dev": true
        },
        "node_modules/nodemailer": {
-            "version": "6.9.8",
-            "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.8.tgz",
-            "integrity": "sha512-cfrYUk16e67Ks051i4CntM9kshRYei1/o/Gi8K1d+R34OIs21xdFnW7Pt7EucmVKA0LKtqUGNcjMZ7ehjl49mQ==",
+            "version": "6.9.15",
+            "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.15.tgz",
+            "integrity": "sha512-AHf04ySLC6CIfuRtRiEYtGEXgRfa6INgWGluDhnxTZhHSKvrBu7lc1VVchQ0d8nPc4cFaZoPq8vkyNoZr0TpGQ==",
+            "license": "MIT-0",
            "engines": {
                "node": ">=6.0.0"
            }
@ -1400,9 +1425,10 @@
            }
        },
        "node_modules/path-to-regexp": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",
-            "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA=="
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz",
+            "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==",
+            "license": "MIT"
        },
        "node_modules/picocolors": {
            "version": "1.0.0",
@ -1610,9 +1636,10 @@
            ]
        },
        "node_modules/react": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-            "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+            "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+            "license": "MIT",
            "dependencies": {
                "loose-envify": "^1.1.0"
            },
@ -1621,15 +1648,16 @@
            }
        },
        "node_modules/react-dom": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-            "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+            "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+            "license": "MIT",
            "dependencies": {
                "loose-envify": "^1.1.0",
-                "scheduler": "^0.23.0"
+                "scheduler": "^0.23.2"
            },
            "peerDependencies": {
-                "react": "^18.2.0"
+                "react": "^18.3.1"
            }
        },
        "node_modules/read-cache": {
@ -1723,9 +1751,10 @@
            "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",
-            "integrity": "sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA==",
+            "version": "2.13.0",
+            "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.13.0.tgz",
+            "integrity": "sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==",
+            "license": "MIT",
            "dependencies": {
                "deepmerge": "^4.2.2",
                "escape-string-regexp": "^4.0.0",
@ -1736,9 +1765,10 @@
            }
        },
        "node_modules/scheduler": {
-            "version": "0.23.0",
-            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-            "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+            "version": "0.23.2",
+            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+            "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+            "license": "MIT",
            "dependencies": {
                "loose-envify": "^1.1.0"
            }
@ -2028,6 +2058,7 @@
            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "is-number": "^7.0.0"
            },
@ -2042,9 +2073,10 @@
            "dev": true
        },
        "node_modules/tslib": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+            "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+            "license": "0BSD"
        },
        "node_modules/typescript": {
            "version": "5.3.3",
@ -2108,18 +2140,6 @@
                "node": ">= 0.8"
            }
        },
-        "node_modules/watchpack": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-            "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-            "dependencies": {
-                "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.1.2"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
        "node_modules/which": {
            "version": "2.0.2",
            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
--- a/package.json
+++ b/package.json
@ -9,7 +9,7 @@
    "scripts": {
        "dev": "next dev -p 5000",
        "build": "next build",
-        "start": "next start -p 5000",
+        "start": "next start",
        "lint": "next lint",
        "tailwind": "npx tailwindcss -i ./tailwind/tw_main.css -o ./styles/tw_main.css --watch"
    },
@ -29,10 +29,10 @@
        "cors": "^2.8.5",
        "datasquirel": "^1.9.5",
        "gsap": "^3.10.4",
-        "next": "^13.4.10",
+        "next": "^14.2.13",
        "nodemailer": "^6.7.2",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
        "sanitize-html": "^2.11.0",
        "three": "^0.138.3"
    },
--- a/pages/api/healthcheck.ts
+++ b/pages/api/healthcheck.ts
@ -0,0 +1,12 @@
+import { NextApiRequest, NextApiResponse } from "next";
+
+export default async function handler(
+    req: NextApiRequest,
+    res: NextApiResponse
+) {
+    if (req.method !== "GET") return res.json({ msg: "Failed!" });
+
+    res.json({
+        success: true,
+    });
+}
--- a/pages/api/test-route.ts
+++ b/pages/api/test-route.ts
@ -8,7 +8,11 @@ const cors = Cors({

 // Helper method to wait for a middleware to execute before continuing
 // And to throw an error when an error happens in a middleware
-function runMiddleware(req: NextApiRequest, res: NextApiResponse, fn: Function) {
+function runMiddleware(
+    req: NextApiRequest,
+    res: NextApiResponse,
+    fn: Function
+) {
    return new Promise((resolve, reject) => {
        fn(req, res, (result: any) => {
            if (result instanceof Error) {
@ -20,23 +24,20 @@ function runMiddleware(req: NextApiRequest, res: NextApiResponse, fn: Function)
    });
 }

-/**
- * @type {NextApiHandler}
- */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-    // res.setHeader("Access-Control-Allow-Credentials", "true");
-    // res.setHeader("Access-Control-Allow-Origin", "*");
-    // res.setHeader("Access-Control-Allow-Methods", "*");
-    // res.setHeader("Access-Control-Allow-Headers", "*");
-
+export default async function handler(
+    req: NextApiRequest,
+    res: NextApiResponse
+) {
    res.setHeader("Access-Control-Allow-Credentials", "true");
    res.setHeader("Access-Control-Allow-Origin", "*");
-    // another common pattern
-    // res.setHeader('Access-Control-Allow-Origin', req.headers.origin);
-    res.setHeader("Access-Control-Allow-Methods", "GET,OPTIONS,PATCH,DELETE,POST,PUT");
-    res.setHeader("Access-Control-Allow-Headers", "X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version");
-
-    // await runMiddleware(req, res, cors);
+    res.setHeader(
+        "Access-Control-Allow-Methods",
+        "GET,OPTIONS,PATCH,DELETE,POST,PUT"
+    );
+    res.setHeader(
+        "Access-Control-Allow-Headers",
+        "X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version"
+    );

    res.json({
        title: "Hello There",
Author	SHA1	Message	Date
Benjamin Toby	f8d31a4060	Deployment Test	2024-10-05 12:11:28 +01:00
Benjamin Toby	3acd96209c	Update docker healthcheck route	2024-10-04 21:46:06 +01:00
Benjamin Toby	9a11e746e7	Add docker healthcheck route	2024-10-04 21:43:03 +01:00
Benjamin Toby	68b82bffc4	Update packages	2024-10-01 16:22:49 +01:00
Benjamin Toby	8f5e193c63	update Dockerfile	2024-10-01 16:20:22 +01:00
Benjamin Toby	a3732103bf	Bugfix	2024-10-01 16:17:51 +01:00
Benjamin Toby	a6a3b8056d	update Dockerfile	2024-10-01 16:13:41 +01:00
Benjamin Toby	9590470a6a	Syntax error fix	2024-10-01 16:09:49 +01:00
Benjamin Toby	178b5d625a	update Dockerfile	2024-10-01 15:56:09 +01:00
Benjamin Toby	429fb43ce3	update Dockerfile	2024-10-01 15:55:38 +01:00
Ben	70c846a030	Update REDEPLOY	2024-07-27 08:27:16 +01:00
Ben	3bf2eddd3d	Update portfolioEntries.json	2024-07-27 08:26:42 +01:00