From 969ea504f3fa4fd70d21d0552b2e6920a8c9f371 Mon Sep 17 00:00:00 2001
From: jon brookes <marshyon@gmail.com>
Date: Sun, 15 Feb 2026 10:37:43 +0000
Subject: [PATCH] fix: merge edits

chore: bump version
---
 .woodpecker/share-lt-build.yaml               | 10 +++---
 app/Providers/Filament/AdminPanelProvider.php | 35 +++++++------------
 cmd/build_container.sh                        |  2 +-
 docs/docker/docker-compose-prod.yaml          |  2 +-
 4 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/.woodpecker/share-lt-build.yaml b/.woodpecker/share-lt-build.yaml
index fcd8806..5054aa6 100644
--- a/.woodpecker/share-lt-build.yaml
+++ b/.woodpecker/share-lt-build.yaml
@@ -14,10 +14,10 @@ steps:
       - docker pull quay.io/marshyon/share-lt:latest || true
       - echo "Building image for testing (amd64 only for CI compatibility)..."
       - docker build --platform linux/amd64 --cache-from=quay.io/marshyon/share-lt:latest -t share-lt:test .
-      - echo "Tagging test image as quay.io/marshyon/share-lt:v0.0.6..."
-      - docker tag share-lt:test quay.io/marshyon/share-lt:v0.0.6
+      - echo "Tagging test image as quay.io/marshyon/share-lt:v0.0.7..."
+      - docker tag share-lt:test quay.io/marshyon/share-lt:v0.0.7
       - echo "Generating SBOM..."
-      - docker run --rm -v /var/run/docker.sock:/var/run/docker.sock anchore/syft:latest scan quay.io/marshyon/share-lt:v0.0.6 -o cyclonedx-json > sbom.json
+      - docker run --rm -v /var/run/docker.sock:/var/run/docker.sock anchore/syft:latest scan quay.io/marshyon/share-lt:v0.0.7 -o cyclonedx-json > sbom.json
   scan-vulnerabilities:
     image: aquasec/trivy:0.67.2
     volumes:
@@ -43,7 +43,7 @@ steps:
       repo: quay.io/marshyon/share-lt
       platforms: linux/amd64
       tags:
-        - v0.0.6
+        - v0.0.7
         - latest
       username:
         from_secret: QUAY_USERNAME
@@ -59,6 +59,6 @@ steps:
       COSIGN_REGISTRY_PASSWORD:
         from_secret: QUAY_PASSWORD
     commands:
-      - cosign attach sbom --sbom sbom.json quay.io/marshyon/share-lt:v0.0.6 || echo "SBOM attach failed"
+      - cosign attach sbom --sbom sbom.json quay.io/marshyon/share-lt:v0.0.7 || echo "SBOM attach failed"
       - echo "Done - trivy report saved to workspace for manual review"
 
diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
index 6ea4829..f263644 100644
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/app/Providers/Filament/AdminPanelProvider.php
@@ -79,26 +79,18 @@ class AdminPanelProvider extends PanelProvider
                 <script>
                     document.addEventListener("DOMContentLoaded", function() {
                         if (window.Echo) {
-<<<<<<< HEAD
-                            
-=======
->>>>>>> 4143902e603c7e3e25de5e5f49c1116dd5a5743b
                             console.log("Setting up Filament Reverb notifications...");
                             console.log("Available globals:", {
                                 FilamentNotification: typeof FilamentNotification,
                                 Livewire: typeof window.Livewire,
                                 filament: typeof window.filament
                             });
-                            
-<<<<<<< HEAD
-                            
-=======
->>>>>>> 4143902e603c7e3e25de5e5f49c1116dd5a5743b
+
                             // Listen for preview site built events
                             window.Echo.channel("filament-notifications")
                                 .listen("preview-site.built", function(event) {
                                     console.log("🎉 Received preview site built event:", event);
-                                    
+
                                     // Use Filament v4 notification system
                                     if (typeof FilamentNotification !== "undefined") {
                                         new FilamentNotification()
@@ -128,22 +120,22 @@ class AdminPanelProvider extends PanelProvider
                                             display: block !important;
                                             opacity: 1 !important;
                                         `;
-                                        
+
                                         notification.innerHTML = `
                                             <div style="display: flex; align-items: center; justify-content: space-between;">
                                                 <div style="margin-right: 15px;">
                                                     ✓ ${event.message}
                                                 </div>
-                                                <button onclick="this.parentElement.parentElement.remove()" 
+                                                <button onclick="this.parentElement.parentElement.remove()"
                                                         style="background: none; border: none; color: white; font-size: 18px; cursor: pointer; padding: 0;">
                                                     ×
                                                 </button>
                                             </div>
                                         `;
-                                        
+
                                         document.body.appendChild(notification);
                                         console.log("✅ Created fallback notification");
-                                        
+
                                         // Auto-remove after 5 seconds
                                         setTimeout(() => {
                                             if (notification.parentNode) {
@@ -154,11 +146,8 @@ class AdminPanelProvider extends PanelProvider
                                 })
                                 .listen(".preview-site.built", function(event) {
                                     console.log("🔄 Also listening with dot prefix (the working one):", event);
-<<<<<<< HEAD
                                     console.log("message:", event.message);
-=======
->>>>>>> 4143902e603c7e3e25de5e5f49c1116dd5a5743b
-                                    
+
                                     // Use Filament v4 notification system
                                     if (typeof FilamentNotification !== "undefined") {
                                         new FilamentNotification()
@@ -188,22 +177,22 @@ class AdminPanelProvider extends PanelProvider
                                             display: block !important;
                                             opacity: 1 !important;
                                         `;
-                                        
+
                                         notification.innerHTML = `
                                             <div style="display: flex; align-items: center; justify-content: space-between;">
                                                 <div style="margin-right: 15px;">
                                                     🔄 ${event.message}
                                                 </div>
-                                                <button onclick="this.parentElement.parentElement.remove()" 
+                                                <button onclick="this.parentElement.parentElement.remove()"
                                                         style="background: none; border: none; color: white; font-size: 18px; cursor: pointer; padding: 0;">
                                                     ×
                                                 </button>
                                             </div>
                                         `;
-                                        
+
                                         document.body.appendChild(notification);
                                         console.log("✅ Created dot prefix fallback notification");
-                                        
+
                                         // Auto-remove after 5 seconds
                                         setTimeout(() => {
                                             if (notification.parentNode) {
@@ -212,7 +201,7 @@ class AdminPanelProvider extends PanelProvider
                                         }, 5000);
                                     }
                                 });
-                                
+
                             console.log("✅ Event listeners set up for filament-notifications channel");
                         } else {
                             console.error("❌ Echo is not available for Filament notifications");
diff --git a/cmd/build_container.sh b/cmd/build_container.sh
index 4d6db9a..70056f8 100755
--- a/cmd/build_container.sh
+++ b/cmd/build_container.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 LARAVEL_CONTAINER_NAME="quay.io/marshyon/share-lt"
-CONTAINER_LABEL="0.0.1"
+CONTAINER_LABEL="0.0.7"
 CACHE="--no-cache"
 CACHE=""
 
diff --git a/docs/docker/docker-compose-prod.yaml b/docs/docker/docker-compose-prod.yaml
index b7f52a1..1ce7b09 100644
--- a/docs/docker/docker-compose-prod.yaml
+++ b/docs/docker/docker-compose-prod.yaml
@@ -1,6 +1,6 @@
 services:
   app:
-    image: quay.io/marshyon/share-lt:v0.0.6
+    image: quay.io/marshyon/share-lt:v0.0.7
     restart: unless-stopped
     tty: false 
     working_dir: /var/www