Enforce Events favicon everywhere and fix deploy pipeline failures.

Add favicon partial to all standalone pages, regenerate the Events icon asset, and stop marking deploys failed when the nginx vhost step cannot sudo. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-07 11:56:27 +00:00
parent a9b2960893
commit 2c1c3cdd3e
10 changed files with 24 additions and 6 deletions
@@ -92,10 +92,14 @@ jobs:
          if [ ! -f "$NGINX_SCRIPT" ]; then
            NGINX_SCRIPT="/var/www/ladill.com/current/deployment/setup-service-subdomain-nginx.sh"
          fi
-          if [ -f "$NGINX_SCRIPT" ]; then
-            sudo bash "$NGINX_SCRIPT" events --app /var/www/ladill-events/current
-          else
+          if [ ! -f "$NGINX_SCRIPT" ]; then
            echo "WARN: setup-service-subdomain-nginx.sh not found — configure events.ladill.com vhost manually"
+            exit 0
+          fi
+          if sudo -n bash "$NGINX_SCRIPT" events --app /var/www/ladill-events/current; then
+            echo "nginx vhost updated for events.ladill.com"
+          else
+            echo "WARN: nginx vhost step skipped (deploy user cannot sudo) — vhost must already be provisioned"
          fi

      - name: Cleanup
@@ -205,7 +205,13 @@ switch_current_release() {
 }

 log "Switching current release"
-switch_current_release
+if ! switch_current_release; then
+  echo "Failed to point $CURRENT_LINK at $NEW_RELEASE" >&2
+  exit 1
+fi
+
+LIVE_REV="$(cat "$CURRENT_LINK/REVISION" 2>/dev/null || echo unknown)"
+log "Live release: $STAMP (revision $LIVE_REV)"

 log "Optimizing Laravel"
 if [ -L "$CURRENT_LINK" ] && [ -f "$CURRENT_LINK/artisan" ]; then
@@ -4,6 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <title>Signed out — Ladill Events</title>
+    @include('partials.favicon')
 </head>
 <body class="flex min-h-screen items-center justify-center bg-slate-100 font-sans antialiased">
    <div class="text-center">
@@ -3,6 +3,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
+    @include('partials.favicon')
    <title>{{ $qrCode->label }}</title>
    <style>
        *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
@@ -3,6 +3,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
+    @include('partials.favicon')
    <title>QR code inactive</title>
    <style>
        body { margin: 0; min-height: 100vh; display: flex; align-items: center; justify-content: center; font-family: system-ui, sans-serif; background: #f8fafc; color: #334155; padding: 2rem; text-align: center; }
@@ -3,6 +3,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
+    @include('partials.favicon')
    <title>{{ $qrCode->label }}</title>
    <meta name="description" content="{{ $qrCode->typeLabel() }} — {{ $qrCode->label }}">
    @vite(['resources/css/app.css'])
@@ -17,6 +17,7 @@
 <html lang="en">
 <head>
    <meta charset="UTF-8">
+    @include('partials.favicon')
    <title>Badges — {{ $evName }}</title>
    <style>
        * { margin: 0; padding: 0; box-sizing: border-box; -webkit-print-color-adjust: exact; print-color-adjust: exact; }
@@ -3,11 +3,12 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Signed out — Ladill QR Plus</title>
+    <title>Signed out — Ladill Events</title>
+    @include('partials.favicon')
 </head>
 <body class="flex min-h-screen items-center justify-center bg-slate-100 font-sans antialiased">
    <div class="text-center">
-        <p class="text-slate-600">You have been signed out of Ladill QR Plus.</p>
+        <p class="text-slate-600">You have been signed out of Ladill Events.</p>
        <a href="{{ route('sso.connect') }}" class="mt-4 inline-block text-sm font-medium text-indigo-600 hover:text-indigo-800">Sign in again</a>
    </div>
 </body>
@@ -30,6 +30,7 @@ class QrSettingsTest extends TestCase
        $this->actingAs($this->user())
            ->get(route('account.settings'))
            ->assertOk()
+            ->assertSee('favicon.ico', false)
            ->assertSee('New code defaults')
            ->assertSee('Notifications');
    }
@@ -80,6 +81,7 @@ class QrSettingsTest extends TestCase
        $this->actingAs($user)
            ->get(route('events.create'))
            ->assertOk()
+            ->assertSee('favicon.ico', false)
            ->assertSee('#aabbcc', false)
            ->assertSee('"event"', false);
    }