headshed/share-lt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: merge edits

Browse source 
chore: bump version
This commit is contained in:
jon brookes 2026-02-15 10:37:43 +00:00
parent 5646ddd9a3
commit 969ea504f3
4 changed files with 19 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.woodpecker/share-lt-build.yaml
View file

@ -14,10 +14,10 @@ steps:
- docker pull quay.io/marshyon/share-lt:latest || true - docker pull quay.io/marshyon/share-lt:latest || true
- echo "Building image for testing (amd64 only for CI compatibility)..." - 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 . - 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..." - 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.6 - docker tag share-lt:test quay.io/marshyon/share-lt:v0.0.7
- echo "Generating SBOM..." - 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: scan-vulnerabilities:
image: aquasec/trivy:0.67.2 image: aquasec/trivy:0.67.2
volumes: volumes:
@ -43,7 +43,7 @@ steps:
repo: quay.io/marshyon/share-lt repo: quay.io/marshyon/share-lt
platforms: linux/amd64 platforms: linux/amd64
tags: tags:
- v0.0.6 - v0.0.7
- latest - latest
username: username:
from_secret: QUAY_USERNAME from_secret: QUAY_USERNAME
@ -59,6 +59,6 @@ steps:
COSIGN_REGISTRY_PASSWORD: COSIGN_REGISTRY_PASSWORD:
from_secret: QUAY_PASSWORD from_secret: QUAY_PASSWORD
commands: 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" - echo "Done - trivy report saved to workspace for manual review"

35
app/Providers/Filament/AdminPanelProvider.php
View file

@ -79,26 +79,18 @@ class AdminPanelProvider extends PanelProvider
<script> <script>
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
if (window.Echo) { if (window.Echo) {
<<<<<<< HEAD
=======
>>>>>>> 4143902e603c7e3e25de5e5f49c1116dd5a5743b
console.log("Setting up Filament Reverb notifications..."); console.log("Setting up Filament Reverb notifications...");
console.log("Available globals:", { console.log("Available globals:", {
FilamentNotification: typeof FilamentNotification, FilamentNotification: typeof FilamentNotification,
Livewire: typeof window.Livewire, Livewire: typeof window.Livewire,
filament: typeof window.filament filament: typeof window.filament
}); });
<<<<<<< HEAD
=======
>>>>>>> 4143902e603c7e3e25de5e5f49c1116dd5a5743b
// Listen for preview site built events // Listen for preview site built events
window.Echo.channel("filament-notifications") window.Echo.channel("filament-notifications")
.listen("preview-site.built", function(event) { .listen("preview-site.built", function(event) {
console.log("🎉 Received preview site built event:", event); console.log("🎉 Received preview site built event:", event);
// Use Filament v4 notification system // Use Filament v4 notification system
if (typeof FilamentNotification !== "undefined") { if (typeof FilamentNotification !== "undefined") {
new FilamentNotification() new FilamentNotification()
@ -128,22 +120,22 @@ class AdminPanelProvider extends PanelProvider
display: block !important; display: block !important;
opacity: 1 !important; opacity: 1 !important;
`; `;
notification.innerHTML = ` notification.innerHTML = `
<div style="display: flex; align-items: center; justify-content: space-between;"> <div style="display: flex; align-items: center; justify-content: space-between;">
<div style="margin-right: 15px;"> <div style="margin-right: 15px;">
✓ ${event.message} ✓ ${event.message}
</div> </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;"> style="background: none; border: none; color: white; font-size: 18px; cursor: pointer; padding: 0;">
× ×
</button> </button>
</div> </div>
`; `;
document.body.appendChild(notification); document.body.appendChild(notification);
console.log("✅ Created fallback notification"); console.log("✅ Created fallback notification");
// Auto-remove after 5 seconds // Auto-remove after 5 seconds
setTimeout(() => { setTimeout(() => {
if (notification.parentNode) { if (notification.parentNode) {
@ -154,11 +146,8 @@ class AdminPanelProvider extends PanelProvider
}) })
.listen(".preview-site.built", function(event) { .listen(".preview-site.built", function(event) {
console.log("🔄 Also listening with dot prefix (the working one):", event); console.log("🔄 Also listening with dot prefix (the working one):", event);
<<<<<<< HEAD
console.log("message:", event.message); console.log("message:", event.message);
=======
>>>>>>> 4143902e603c7e3e25de5e5f49c1116dd5a5743b
// Use Filament v4 notification system // Use Filament v4 notification system
if (typeof FilamentNotification !== "undefined") { if (typeof FilamentNotification !== "undefined") {
new FilamentNotification() new FilamentNotification()
@ -188,22 +177,22 @@ class AdminPanelProvider extends PanelProvider
display: block !important; display: block !important;
opacity: 1 !important; opacity: 1 !important;
`; `;
notification.innerHTML = ` notification.innerHTML = `
<div style="display: flex; align-items: center; justify-content: space-between;"> <div style="display: flex; align-items: center; justify-content: space-between;">
<div style="margin-right: 15px;"> <div style="margin-right: 15px;">
🔄 ${event.message} 🔄 ${event.message}
</div> </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;"> style="background: none; border: none; color: white; font-size: 18px; cursor: pointer; padding: 0;">
× ×
</button> </button>
</div> </div>
`; `;
document.body.appendChild(notification); document.body.appendChild(notification);
console.log("✅ Created dot prefix fallback notification"); console.log("✅ Created dot prefix fallback notification");
// Auto-remove after 5 seconds // Auto-remove after 5 seconds
setTimeout(() => { setTimeout(() => {
if (notification.parentNode) { if (notification.parentNode) {
@ -212,7 +201,7 @@ class AdminPanelProvider extends PanelProvider
}, 5000); }, 5000);
} }
}); });
console.log("✅ Event listeners set up for filament-notifications channel"); console.log("✅ Event listeners set up for filament-notifications channel");
} else { } else {
console.error("❌ Echo is not available for Filament notifications"); console.error("❌ Echo is not available for Filament notifications");

2
cmd/build_container.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
LARAVEL_CONTAINER_NAME="quay.io/marshyon/share-lt" LARAVEL_CONTAINER_NAME="quay.io/marshyon/share-lt"
CONTAINER_LABEL="0.0.1" CONTAINER_LABEL="0.0.7"
CACHE="--no-cache" CACHE="--no-cache"
CACHE="" CACHE=""

2
docs/docker/docker-compose-prod.yaml
View file

@ -1,6 +1,6 @@
services: services:
app: app:
image: quay.io/marshyon/share-lt:v0.0.6 image: quay.io/marshyon/share-lt:v0.0.7
restart: unless-stopped restart: unless-stopped
tty: false tty: false
working_dir: /var/www working_dir: /var/www