Update website presentation

.dockerignore

@@ -2,6 +2,7 @@ node_modules
 .next
 out
 dist
+tmp
 npm-debug.log
 .npmrc
 .git

.github/workflows/docker-publish.yml

@@ -6,8 +6,7 @@ concurrency:
 
 on:
   push:
-    branches: [master]
-    tags: ["v*"]
+    branches: ["**"]
   pull_request:
   workflow_dispatch:
 
@@ -20,11 +19,13 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      packages: write
 
     steps:
+      - name: Configure Git default branch
+        run: git config --global init.defaultBranch master
+
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Compute image name (lowercase owner/repo)
         id: img
@@ -34,39 +35,42 @@ jobs:
           IMAGE_NAME="${IMAGE_NAME:-$REPO_NAME}"
           IMAGE_NAME="$(echo "${IMAGE_NAME}" | tr '[:upper:]' '[:lower:]')"
           echo "IMAGE=${REGISTRY}/${OWNER}/${IMAGE_NAME}" >> "$GITHUB_ENV"
+          echo "Image namespace: ${REGISTRY}/${OWNER}/${IMAGE_NAME}"
 
       - name: Docker metadata
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ${{ env.IMAGE }}
           tags: |
             type=sha
-            type=ref,event=tag
             type=ref,event=branch,enable=${{ github.ref == 'refs/heads/master' }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
 
       - name: Set up Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Build image for tests
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: ./Dockerfile
           push: false
           load: true
-          tags: ${{ env.IMAGE }}:ci
+          tags: |
+            ${{ env.IMAGE }}:ci
+            ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max,ignore-error=true
 
-      - name: Run smoke test (curl /)
+      - name: Run smoke test
         env:
           IMAGE_UNDER_TEST: ${{ env.IMAGE }}:ci
         run: |
           set -euo pipefail
           cid=$(docker run -d -p 0:3000 "$IMAGE_UNDER_TEST")
-          trap "docker rm -f $cid >/dev/null 2>&1" EXIT
+          trap 'docker rm -f "$cid" >/dev/null 2>&1' EXIT
           port=$(docker inspect -f '{{ (index (index .NetworkSettings.Ports "3000/tcp") 0).HostPort }}' "$cid")
           if [ -z "$port" ]; then
             echo "Failed to resolve mapped port for container $cid" >&2
@@ -75,31 +79,72 @@ jobs:
           fi
           for i in {1..20}; do
             if curl -fsS "http://127.0.0.1:${port}/" > /dev/null; then
-              exit 0
+              break
+            fi
+            if [ "$i" -eq 20 ]; then
+              echo "Service did not respond on / after 20s" >&2
+              docker logs "$cid" || true
+              exit 1
             fi
             sleep 1
           done
-          echo "Service did not respond on / after 20s" >&2
-          docker logs "$cid" || true
-          exit 1
+          for path in / /about /services /nabla /presentations /healthz; do
+            curl -fsS "http://127.0.0.1:${port}${path}" > /dev/null
+          done
+
+  publish:
+    needs: build
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Configure Git default branch
+        run: git config --global init.defaultBranch master
+
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Compute image name (lowercase owner/repo)
+        id: img
+        run: |
+          OWNER="$(echo "${GITHUB_REPOSITORY_OWNER}" | tr '[:upper:]' '[:lower:]')"
+          REPO_NAME="${GITHUB_REPOSITORY##*/}"
+          IMAGE_NAME="${IMAGE_NAME:-$REPO_NAME}"
+          IMAGE_NAME="$(echo "${IMAGE_NAME}" | tr '[:upper:]' '[:lower:]')"
+          echo "IMAGE=${REGISTRY}/${OWNER}/${IMAGE_NAME}" >> "$GITHUB_ENV"
+          echo "Image namespace: ${REGISTRY}/${OWNER}/${IMAGE_NAME}"
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          images: ${{ env.IMAGE }}
+          tags: |
+            type=sha
+            type=ref,event=branch
+            type=raw,value=latest
+
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@v4
 
       - name: Log in to GHCR
-        if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/'))
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           # Prefer CR_PAT if provided (for cross-repo scopes); fallback to GITHUB_TOKEN
           password: ${{ secrets.CR_PAT != '' && secrets.CR_PAT || secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/'))
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: ./Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max,ignore-error=true

.gitignore

@@ -41,4 +41,8 @@ yarn-error.log*
 next-env.d.ts
 
 # updating user ssh dir
-.ssh
+.ssh
+
+# Transient cleanup
+.old_nm_trash*
+tmp/

.npmrc

@@ -0,0 +1,2 @@
+auto-install-peers=false
+strict-peer-dependencies=false

Caddyfile.site

@@ -0,0 +1,6 @@
+:3000 {
+	root * /srv
+	respond /healthz 200
+	try_files {path} {path}.html {path}/index.html
+	file_server
+}

Dockerfile

@@ -3,8 +3,7 @@
 FROM node:22-alpine AS build
 WORKDIR /app
 
-ENV NODE_ENV=production \
-    NEXT_TELEMETRY_DISABLED=1
+ENV NEXT_TELEMETRY_DISABLED=1
 
 RUN apk add --no-cache libc6-compat
 
@@ -20,7 +19,8 @@ WORKDIR /srv
 RUN addgroup -S caddy && adduser -S caddy -G caddy
 
 COPY --from=build --chown=caddy:caddy /app/out ./
+COPY --chown=caddy:caddy Caddyfile.site /etc/caddy/Caddyfile
 
 EXPOSE 3000
 USER caddy
-ENTRYPOINT ["caddy", "file-server", "--root=/srv", "--listen=:3000"]
+ENTRYPOINT ["caddy", "run", "--config=/etc/caddy/Caddyfile"]

app/about/page.tsx

@@ -1,96 +1,19 @@
-import Link from "next/link"
-import Image, { StaticImageData } from "next/image";
-import { Paragraph, Chapter } from "../components/TextUtils"
-import ContactEmail from "./ContactEmail"
-
-import vulkanised2026_01 from "@/public/vulkanised_photos/2026/2026_01.jpg";
-import vulkanised2026_02 from "@/public/vulkanised_photos/2026/2026_02.jpg";
-import vulkanised2026_03 from "@/public/vulkanised_photos/2026/2026_03.jpg";
-import vulkanised2026_04 from "@/public/vulkanised_photos/2026/2026_04.jpg";
-import vulkanised2026_06 from "@/public/vulkanised_photos/2026/2026_06.jpg";
-import vulkanised2026_07 from "@/public/vulkanised_photos/2026/2026_07.jpg";
-import vulkanised2026_08 from "@/public/vulkanised_photos/2026/2026_08.jpg";
-import vulkanised2026_09 from "@/public/vulkanised_photos/2026/2026_09.jpg";
-import vulkanised2023_1 from "@/public/vulkanised_photos/2023/2023_1.jpg";
-import vulkanised2023_2 from "@/public/vulkanised_photos/2023/2023_2.jpg";
-import vulkanised2024_1 from "@/public/vulkanised_photos/2024/2024_1.jpg";
-import vulkanised2024_2 from "@/public/vulkanised_photos/2024/2024_2.jpg";
-
-const vulkanisedPhotos: { src: StaticImageData; alt: string }[] = [
-    { src: vulkanised2026_01, alt: "Vulkanised 2026 photo 1" },
-    { src: vulkanised2026_02, alt: "Vulkanised 2026 photo 2" },
-    { src: vulkanised2026_04, alt: "Vulkanised 2026 photo 4" },
-    { src: vulkanised2026_03, alt: "Vulkanised 2026 photo 3" },
-    { src: vulkanised2026_06, alt: "Vulkanised 2026 photo 6" },
-    { src: vulkanised2026_08, alt: "Vulkanised 2026 photo 8" },
-    { src: vulkanised2026_09, alt: "Vulkanised 2026 photo 9" },
-    { src: vulkanised2026_07, alt: "Vulkanised 2026 photo 7" },
-    { src: vulkanised2023_1, alt: "Vulkanised 2023 photo 1" },
-    { src: vulkanised2023_2, alt: "Vulkanised 2023 photo 2" },
-    { src: vulkanised2024_1, alt: "Vulkanised 2024 photo 1" },
-    { src: vulkanised2024_2, alt: "Vulkanised 2024 photo 2" }
-];
-
-function VulkanisedPhoto({ src, alt, priority = false }: { src: StaticImageData | string, alt: string, priority?: boolean }) {
-    return (
-        <div className="relative w-[400px] aspect-video overflow-hidden rounded-md bg-neutral-900/70 ring-1 ring-white/5">
-            <Image
-                src={src}
-                alt=""
-                aria-hidden="true"
-                fill
-                sizes="400px"
-                placeholder="blur"
-                className="object-cover blur-lg scale-105 opacity-60"
-            />
-            <Image
-                src={src}
-                alt={alt}
-                fill
-                sizes="400px"
-                placeholder="blur"
-                priority={priority}
-                className="object-contain"
-            />
-        </div>
-    )
-}
+import { Paragraph, Chapter } from "../components/TextUtils";
+import { aboutParagraphs } from "../data/aboutContent";
 
 export default function Page() {
     return (
-        <main className="container mx-auto max-sm:px-8 flex flex-col gap-4 sm:gap-8 sm:items-center h-full justify-center">
-            <Chapter title="About Us">
+        <main className="site-container-narrow section-pad flex flex-col gap-10 sm:gap-14">
+            <Chapter title="Who We Are">
                 <Paragraph>
-                    DevSH Graphics Programming Sp. z O.O is a company focused on Graphics, GPU and High Performance Computing. Our consultants develop and maintain Renderers, Simulations and Compilers for our Clients, integrated into or working alongside their teams. We are not a Software House, we work very closely and synergize with our Clients&apos; engineers.
-                    We also conduct our own R&amp;D developing our own Open Source Middleware and Libraries, the most prominent being Nabla, as well as contributing to existing ones.
-                    <br />
-                    <br />
-                    The primary mission for all of our self-funded developments is to advance Open Source ecosystems with innovative tooling with a particular focus on Khronos Standards. We maintain a single source HLSL202x/C++20 Standard Template Header Only Library and our Utility and Rapid Prototyping Framework <Link href="https://github.com/Devsh-Graphics-Programming/Nabla" target="_blank" rel="noopener noreferer" className="no-underline text-teal-600 devsh-link">Nabla</Link> designed {/*this prevents visual bug, "designed must stay here"*/}
-                    to give a CUDA-like programming experience within the Vulkan ecosystem.
-                    <br />
-                    <br />
-                    We have honed the culture of remote work, since the company&apos;s inception, and way before the 2019 paradigm shift. Subject to availability and specific expertise required, our consultants&apos; regular working hours overlap the normal working hours from San Francisco to Sydney.
-                    <br />
-                    <br />
-                    Our alumni have since worked at Intel, Huawei, ARM and Apple as driver and devtech developers and on AAA games.
-                </Paragraph>
-
-                <div className="grid grid-cols-1 lg:grid-cols-2 my-4 gap-4">
-                    {vulkanisedPhotos.map((photo, index) => (
-                        <VulkanisedPhoto
-                            key={photo.alt}
-                            src={photo.src}
-                            alt={photo.alt}
-                            priority={index < 4}
-                        />
+                    {aboutParagraphs.map((paragraph, index) => (
+                        <span key={index}>
+                            {paragraph}
+                            {index < aboutParagraphs.length - 1 && <><br /><br /></>}
+                        </span>
                     ))}
-                </div>
-            </Chapter>
-            <Chapter title="Contact">
-                <Paragraph>
-                    If you&apos;re interested in our offer, you can reach us at this e-mail address: <ContactEmail/>
                 </Paragraph>
             </Chapter>
         </main>
-    )
+    );
 }

app/components/AboutSection.tsx

@@ -0,0 +1,26 @@
+import CTAButton from "./CTAButton";
+import { aboutParagraphs } from "../data/aboutContent";
+
+export default function AboutSection() {
+  return (
+    <section id="about" className="scroll-mt-24 pb-14 pt-6 sm:pb-20 sm:pt-6 lg:pb-24 lg:pt-6">
+      <div className="site-container-narrow">
+        <div className="section-head mb-9 sm:mb-10">
+          <h2 className="section-heading">Who We Are</h2>
+        </div>
+
+        <div className="flex flex-col gap-5 text-base leading-relaxed text-neutral-300 sm:text-lg">
+          {aboutParagraphs.map((paragraph, index) => (
+            <p key={index} className="!m-0">
+              {paragraph}
+            </p>
+          ))}
+        </div>
+
+        <div className="mt-10 flex justify-center sm:mt-12">
+          <CTAButton href="/services" />
+        </div>
+      </div>
+    </section>
+  );
+}

app/components/CTAButton.tsx

@@ -0,0 +1,41 @@
+type Size = "md" | "lg";
+
+export default function CTAButton({
+  href = "#",
+  label = "Talk to our experts",
+  size = "lg",
+}: {
+  href?: string;
+  label?: string;
+  size?: Size;
+}) {
+  const sizing =
+    size === "lg"
+      ? "w-full max-w-64 sm:w-auto sm:min-w-56 px-4 py-2.5 text-sm sm:px-5 sm:text-base"
+      : "px-4 py-2.5 text-sm sm:px-5 sm:text-base";
+
+  return (
+    <a
+      href={href}
+      className={`brand-button group relative inline-flex items-center justify-center gap-3 ${sizing} rounded-md border border-[var(--brand-accent)]/70 bg-black/45 font-semibold text-[var(--brand-accent-bright)] transition-all duration-200 hover:-translate-y-0.5 hover:border-[var(--brand-accent-bright)] active:translate-y-0 focus:outline-none focus:ring-2 focus:ring-[var(--brand-accent-bright)] focus:ring-offset-2 focus:ring-offset-black`}
+      style={{ background: "linear-gradient(180deg, rgba(125, 205, 185, 0.16), rgba(85, 181, 166, 0.08))" }}
+    >
+      <span>{label}</span>
+      <span className="flex h-7 w-7 items-center justify-center rounded border border-[var(--brand-accent)]/70 bg-[var(--brand-accent)] text-[#031111] transition-transform duration-200 group-hover:translate-x-0.5 group-hover:bg-[var(--brand-accent-bright)]">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          strokeWidth="2.3"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          className="h-4 w-4"
+          aria-hidden="true"
+        >
+          <path d="M5 12h14M13 5l7 7-7 7" />
+        </svg>
+      </span>
+    </a>
+  );
+}