Merge Upstream

.github/workflows/main.yml

@@ -1,34 +1,38 @@
-name: MAIN Workflow
+name: Deploy to Portainer
 
 on:
   push:
     branches:
       - main
 
 jobs:
-  docker-build-api:
+  build-and-push-image:
+    name: Build and Push Docker Image to GitHub Container Registry
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
+      - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Login to GitHub Container Registry
+      - name: Docker Login (GitHub Container Registry)
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build API Docker image
+      - name: Build Docker Image
         run: docker build -t ghcr.io/lyttle-development/lyttledev-website:main .
 
-      - name: Push API Docker image to GitHub Container Registry
+      - name: Push Docker Image
         run: docker push ghcr.io/lyttle-development/lyttledev-website:main
 
-      - name: Deploy Image to CapRover
-        uses: caprover/deploy-from-github@v1.1.2
+  trigger-portainer-webhook:
+    name: Trigger Portainer Webhook
+    runs-on: ubuntu-latest
+    needs: build-and-push-image
+    steps:
+      - name: Call Portainer Webhook
+        uses: fjogeleit/http-request-action@v1
         with:
-          server: "${{ secrets.CAPROVER_SERVER }}"
-          app: "${{ secrets.CAPROVER_APP_NAME }}"
-          token: "${{ secrets.CAPROVER_APP_TOKEN }}"
-          image: "ghcr.io/lyttle-development/lyttledev-website:main"
+          url: ${{ secrets.PORTAINER_WEBHOOK_URL }}
+          method: POST

.gitignore

@@ -6,7 +6,7 @@ node_modules
 .next
 .vercel
 .idea
-libs
+libs/payload-defaults
 
 # Payload default media upload directory
 public/media/

Dockerfile

@@ -1,5 +1,5 @@
 # Use an official Node.js runtime as a parent image
-FROM node:22.11.0
+FROM node:24.11.1
 
 # Set the working directory in the container
 WORKDIR /app
@@ -17,5 +17,5 @@ EXPOSE 3000
 CMD ["npm", "start"]
 
 # Add a health check
-HEALTHCHECK --interval=30s --timeout=10s --start-period=1000s --retries=3 \
+HEALTHCHECK --interval=30s --timeout=10s --start-period=10000s --retries=3 \
   CMD curl -f http://localhost:3000/api/health || exit 1

constants.ts

@@ -13,7 +13,7 @@ export const MODULE_ENABLED: ModuleEnabled = {
   forms: false,
   media: true,
   pages: true,
-  posts: false,
+  posts: true,
   redirects: false,
   search: false,
   users: true,

next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

next.config.js

@@ -4,20 +4,36 @@ import redirects from './redirects.js'
 
 const NEXT_PUBLIC_SERVER_URL = process.env.VERCEL_PROJECT_PRODUCTION_URL
   ? `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`
-  : undefined || process.env.NEXT_PUBLIC_SERVER_URL || 'http://localhost:3000'
+  : process.env.NEXT_PUBLIC_SERVER_URL || 'http://localhost:3000'
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   images: {
     remotePatterns: [
-      ...[NEXT_PUBLIC_SERVER_URL /* 'https://example.com' */].map((item) => {
-        const url = new URL(item)
+      // Ensure we don't pass empty/invalid values into new URL()
+      ...[
+        'http://localhost',
+        'http://localhost:3000',
+        'https://www.lyttledevelopment.com',
+        NEXT_PUBLIC_SERVER_URL /* 'https://example.com' */,
+      ]
+        .filter(Boolean)
+        .map((item) => {
+          try {
+            const url = new URL(item)
 
-        return {
-          hostname: url.hostname,
-          protocol: url.protocol.replace(':', ''),
-        }
-      }),
+            return {
+              hostname: url.hostname,
+              protocol: url.protocol.replace(':', ''),
+            }
+          } catch (_err) {
+            // If an invalid URL is provided, skip it rather than crashing.
+            // Keep the behavior safe for local development when env vars may be empty.
+            console.warn('Skipping invalid NEXT_PUBLIC_SERVER_URL for remotePatterns:', item)
+            return null
+          }
+        })
+        .filter(Boolean),
     ],
   },
   reactStrictMode: true,