Merge pull request 'development' (#44) from development into main

Reviewed-on: #44

dockerfile

@@ -1,4 +1,4 @@
-FROM git.luke-else.co.uk/luke-else/nodejs:latest AS build
+FROM node:lts-slim as build
 
 WORKDIR /app
 
@@ -6,15 +6,15 @@ COPY package*.json ./
 RUN rm -rf node_modules
 RUN rm -rf build
 COPY . .
-RUN pnpm install
+RUN npm install
-RUN pnpm run build
+RUN npm run build
 
-FROM git.luke-else.co.uk/luke-else/nodejs:latest AS run
+FROM node:lts-slim as run
 
 WORKDIR /app
 COPY --from=build /app/package.json ./package.json
 COPY --from=build /app/build ./build
-RUN pnpm install --prod
+RUN npm install --omit=dev
 
 EXPOSE 3000
-ENTRYPOINT [ "pnpm", "run", "start" ]
+ENTRYPOINT [ "npm", "run", "start" ]

src/main.svelte

@@ -35,7 +35,7 @@
                     alt="Avatar"
                     class="max-md:hidden rounded-full w-32 h-32 md:w-48 md:h-48 mt-2 mb-2 p-2 border-3"
                 />
-                <p class="[&>*]:underline [&>*]:decoration-2 [&>*]:decoration-transparent [&>*]:hover:decoration-inherit [&>*]:transition-all [&>*]:duration-300 [&>*]:text-green-600">{@html info.about}</p>
+                <p>{@html info.about}</p>
             </div>
             <h3 slot="footerLeft">{@html info.location}</h3>
         </Card>

static/json/me.json

@@ -22,12 +22,12 @@
       "competency": 80
     },
     {
-      "name" : "Python",
+      "name": "Tailwind CSS",
-      "logo": "devicon-python-plain",
+      "logo": "devicon-tailwindcss-plain",
-      "colour": "bg-yellow-400",
+      "colour": "bg-blue-800",
-      "link": "https://python.org",
+      "link": "https://tailwindcss.com/",
-      "about": "Python is a versatile language known for its simplicity and readability, making it ideal for rapid development and data analysis.",
+      "about": "Tailwind CSS is a utility-first CSS framework that enables rapid UI development with a focus on customization and responsiveness.",
-      "competency": 70
+      "competency": 60
     },
     {
       "name": "Git",
@@ -45,54 +45,6 @@
       "about": "Docker simplifies deployment by packaging applications in lightweight containers, ensuring consistency across environments.",
       "competency": 100
     },
-    {
-      "name": "Kubernetes",
-      "logo": "devicon-kubernetes-plain",
-      "colour": "bg-blue-600",
-      "link": "https://kubernetes.io",
-      "about": "Kubernetes automates the deployment, scaling, and management of containerized applications, enhancing operational efficiency.",
-      "competency": 40
-    },
-    {
-      "name": "PostgreSQL",
-      "logo": "devicon-postgresql-plain",
-      "colour": "bg-blue-700",
-      "link": "https://postgresql.org",
-      "about": "PostgreSQL is a powerful, open-source relational database known for its robustness and advanced features.",
-      "competency": 70
-    },
-    {
-      "name": "MongoDB",
-      "logo": "devicon-mongodb-plain",
-      "colour": "bg-green-500",
-      "link": "https://mongodb.com",
-      "about": "MongoDB is a NoSQL database that provides flexibility and scalability for modern applications with unstructured data.",
-      "competency": 70
-    },
-    {
-      "name": "Redis",
-      "logo": "devicon-redis-plain",
-      "colour": "bg-red-600",
-      "link": "https://redis.io",
-      "about": "Redis is an in-memory data structure store, used as a database, cache, and message broker for high-performance applications.",
-      "competency": 30
-    },
-    {
-      "name": "JavaScript",
-      "logo": "devicon-javascript-plain",
-      "colour": "bg-yellow-500",
-      "link": "https://javascript.com",
-      "about": "JavaScript is a versatile language that powers dynamic web applications and enhances user interactivity.",
-      "competency": 60
-    },
-    {
-      "name": "Tailwind CSS",
-      "logo": "devicon-tailwindcss-plain",
-      "colour": "bg-blue-800",
-      "link": "https://tailwindcss.com/",
-      "about": "Tailwind CSS is a utility-first CSS framework that enables rapid UI development with a focus on customization and responsiveness.",
-      "competency": 60
-    },
     {
       "name": "Svelte",
       "logo": "devicon-svelte-plain",
@@ -104,14 +56,9 @@
   ],
   "timeline" : [
     {
-      "duration" : "April 2025 - Present",
+      "duration" : "September 2022 - Present",
-      "title" : "Thales UK (DDCC) - Software Engineer",
+      "title" : "Thales UK - Software Engineer",
-      "description" : "As a 3rd year apprentice at Thales UK’s Digital Data Competency Centre, I have taken on responsibility for developing microservices that encapsulate Machine Learning models provided by R&D teams, helping to advance product readiness. These services are primarily written in Python and deployed to Kubernetes clusters for use across the business. Our team also designs and maintains CI/CD pipelines to automate the deployment of both these services and their supporting infrastructure."
+      "description" : "As a software engineering apprentice at Thales UK, I find myself partaking in agile / scrum development methodologies in a strong team of 6 other engineers. The team iterates on a pre-existing system designed for the MOD, written in C++, using internal frameworks to assist."
-    },
-    {
-      "duration" : "September 2022 - April 2025",
-      "title" : "Thales UK (ISR) - Software Engineer",
-      "description" : "As a software engineering apprentice at Thales UK, Intelligence Surveillance and Reconnaissance, I worked within an agile team of six engineers, contributing to the ongoing development of a C++ system for the MOD. My role involved collaborating closely with colleagues, following Scrum methodologies, and leveraging internal frameworks to enhance and maintain the existing platform."
     },
     {
       "duration" : "September 2022 - Present",