Merge pull request #18 from codebuilderinc/fix/video-watermark-offset

chore: offset video player position to hide watermarks

Author: digitalnomad91

.github/workflows/cloudflare-pages-runtime.yml

@@ -16,6 +16,8 @@ jobs:
   deploy-runtime:
     name: 🏗 Build and Deploy Runtime
     runs-on: ubuntu-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
     steps:
       - name: 🔍 Checkout repository

.github/workflows/cloudflare-pages.yml

@@ -16,6 +16,8 @@ jobs:
   deploy:
     name: 🏗 Build and Deploy
     runs-on: ubuntu-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
     steps:
       - name: 🔍 Checkout repository
@@ -52,11 +54,24 @@ jobs:
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           PROJECT_NAME: ${{ secrets.CLOUDFLARE_PAGES_PROJECT_NAME }}
         run: |
-          RESPONSE=$(curl -fsSL \
+          echo "Checking variables..."
+          echo "ACCOUNT_ID is set: $(if [ -n "$CLOUDFLARE_ACCOUNT_ID" ]; then echo "Yes (length: ${#CLOUDFLARE_ACCOUNT_ID})"; else echo "No"; fi)"
+          echo "API_TOKEN is set: $(if [ -n "$CLOUDFLARE_API_TOKEN" ]; then echo "Yes (length: ${#CLOUDFLARE_API_TOKEN})"; else echo "No"; fi)"
+          echo "PROJECT_NAME: $PROJECT_NAME"
+
+          RESPONSE=$(curl -s \
             -H "Authorization: Bearer $CLOUDFLARE_API_TOKEN" \
             -H "Content-Type: application/json" \
             "https://api.cloudflare.com/client/v4/accounts/$CLOUDFLARE_ACCOUNT_ID/pages/projects")
 
+          SUCCESS=$(printf '%s' "$RESPONSE" | jq -r '.success')
+          if [ "$SUCCESS" != "true" ]; then
+            echo "API Request Failed! The token might be invalid or lacking permissions."
+            echo "Errors:"
+            printf '%s' "$RESPONSE" | jq -r '.errors[]? | "\(.code): \(.message)"'
+            exit 1
+          fi
+
           COUNT=$(printf '%s' "$RESPONSE" | jq '.result | length')
           MATCH=$(printf '%s' "$RESPONSE" | jq --arg name "$PROJECT_NAME" 'any(.result[]?; .name == $name)')
 

.github/workflows/deploy-docker.depracated.yml

@@ -0,0 +1,56 @@
+name: '🚀 Deploy Next.js Docker App (Single Job)'
+
+on:
+  push:
+    branches: [disabled]
+
+jobs:
+  build-and-deploy:
+    runs-on: self-hosted
+    name: '🐳 Build & Deploy'
+    steps:
+      - name: '🔍 Checkout Code'
+        uses: actions/checkout@v3
+
+      # ========================
+      # 🔐 Secrets & Config Setup
+      # ========================
+      - name: '🔒 Verify Secrets Exist'
+        run: |
+          if [ -z "${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}" ]; then
+            echo "❌ Critical error: GOOGLE_SERVICES_JSON_BASE64 secret missing!"
+            exit 1
+          fi
+          echo "✅ All secrets present"
+
+      - name: '📁 Create google-services.json'
+        run: |
+          echo "$GOOGLE_SERVICES_JSON_BASE64" | base64 --decode > google-services.json
+          echo "🔄 Validating JSON..."
+          jq empty google-services.json  # Requires jq installed
+        env:
+          GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
+
+      - name: '⚙️ Create .env File'
+        run: |
+          echo "${{ secrets.ENV_FILE_CONTENT }}" > .env
+          echo "" >> .env  # Ensure trailing newline
+
+      # ========================
+      # 🐳 Docker Operations
+      # ========================
+      - name: '🛠 Build Docker Image'
+        run: docker build -t codebuilder-frontend:latest .
+
+      - name: '🗑 Cleanup Old Containers'
+        run: |
+          docker ps -aq --filter name=codebuilder-frontend | xargs -r docker rm -f
+
+      - name: '🚀 Launch New Container'
+        run: |
+          docker run -d \
+            --network host \
+            -p 3000:3000 \
+            --env-file .env \
+            --name codebuilder-frontend \
+            codebuilder-frontend:latest

.github/workflows/deploy.yml

@@ -8,6 +8,8 @@ jobs:
   build-and-deploy:
     runs-on: self-hosted
     name: '🐳 Build & Deploy'
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
     steps:
       - name: '🔍 Checkout Code'

.github/workflows/nextjs-static-gh-pages.yml

@@ -19,6 +19,8 @@ jobs:
   build-and-deploy:
     name: 🏗 Build & Deploy
     runs-on: ubuntu-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
     steps:
       - name: 🔍 Checkout repository

next.config.ts

@@ -28,6 +28,7 @@ const nextConfig = {
   assetPrefix: ghPagesBasePath ? `${ghPagesBasePath}/` : undefined,
 
   allowedDevOrigins: [
+    'https://codebuilder.org',
     'https://api.codebuilder.org',
     'https://new.codebuilder.org',
     'https://new.codebuilder.org:443',

public/sw.js

@@ -5,8 +5,8 @@ self.addEventListener('push', (event) => {
     const data = event.data.json()
     const options = {
       body: data.body,
-      icon: data.icon || 'https://new.codebuilder.org/images/logo2.png', // Use a default icon if none is specified
-      badge: data.badge || 'https://new.codebuilder.org/images/logo2.png',
+      icon: data.icon || 'https://codebuilder.org/images/logo2.png', // Use a default icon if none is specified
+      badge: data.badge || 'https://codebuilder.org/images/logo2.png',
       data: { url: data.url },
     }
 

public/template/videos/futuristic-technology-abstract-background_4k3v6uqwg__WL.mp4

@@ -142,7 +142,7 @@ export default function About() {
   return (
     <div className={`${Raleway.className}`}>
       {/* Banner with Video Background — pt offsets the fixed header */}
-      <div className="relative w-full h-[420px] overflow-hidden">
+      <div className="relative w-full h-[380px] overflow-hidden">
         {/* Video Background */}
         <div className="absolute inset-0">
           <div className="absolute inset-0 opacity-40">
@@ -157,7 +157,7 @@ export default function About() {
         </div>
 
         {/* Banner Content — pt accounts for 74px fixed header */}
-        <div className="relative z-10 flex items-center justify-center h-full pt-[74px] px-4">
+        <div className="relative z-10 flex items-center justify-center h-full px-4 pt-10">
           <div className="text-center max-w-3xl mx-auto">
             <h2
               className={`text-white text-[28px] uppercase font-light mb-2 drop-shadow-md ${

src/app/about/page.tsx

@@ -21,14 +21,12 @@ export const POST = withLogging(async (request: NextRequest) => {
       title: `${title}`,
       body: body,
       url: url,
-      icon: 'https://new.codebuilder.org/images/logo2.png',
-      badge: 'https://new.codebuilder.org/images/logo2.png',
+      icon: 'https://codebuilder.org/images/logo2.png',
+      badge: 'https://codebuilder.org/images/logo2.png',
     }
 
     // Loop and send notifications concurrently
-    const notificationPromises = subscriptions.map((sub) =>
-      sendNotification(sub, notificationPayload)
-    )
+    const notificationPromises = subscriptions.map((sub) => sendNotification(sub, notificationPayload))
 
     // Wait for all notifications to complete
     await Promise.all(notificationPromises)