From 6c81dd1d482992ac1a15be1b3b980ed0280e4b93 Mon Sep 17 00:00:00 2001
From: boban <boban.blaskovic@gmail.com>
Date: Sat, 16 May 2026 13:23:44 +0200
Subject: [PATCH] fix: eliminate FOUC, Echo, modal duplicate, icons, test DB
 isolation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- FIX 1: Remove duplicate modal container (keep @livewire directive, drop <x-modal-container>)
- FIX 2: Add Laravel Echo + Pusher to bootstrap.js with Reverb config
- FIX 3: Cookie-based theme — exclude nimuli_theme from encryption, write cookie in Alpine store, read server-side in layout
- FIX 4: Generate missing PNG favicons (16/32/180/192/512px) via GD
- FIX 5: Create scripts/verify-modals.sh (27 checks, all green)
- BUG: Docker OS env DB_CONNECTION=mysql was overriding phpunit.xml sqlite config, causing RefreshDatabase to migrate:fresh production MySQL — fixed by forcing DB vars in tests/bootstrap.php alongside existing APP_ENV fix

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 bootstrap/app.php                            |   2 +
 public/android-chrome-192x192.png            | Bin 0 -> 618 bytes
 public/android-chrome-512x512.png            | Bin 0 -> 1941 bytes
 public/apple-touch-icon.png                  | Bin 0 -> 569 bytes
 public/favicon-16x16.png                     | Bin 0 -> 145 bytes
 public/favicon-32x32.png                     | Bin 0 -> 171 bytes
 resources/js/app.js                          |   1 +
 resources/js/bootstrap.js                    |  15 +-
 resources/views/layouts/nimuli-app.blade.php |   9 +-
 scripts/verify-modals.sh                     | 150 +++++++++++++++++++
 tests/bootstrap.php                          |  12 +-
 11 files changed, 181 insertions(+), 8 deletions(-)
 create mode 100644 public/android-chrome-192x192.png
 create mode 100644 public/android-chrome-512x512.png
 create mode 100644 public/apple-touch-icon.png
 create mode 100644 public/favicon-16x16.png
 create mode 100644 public/favicon-32x32.png
 create mode 100755 scripts/verify-modals.sh

diff --git a/bootstrap/app.php b/bootstrap/app.php
index 1ac8199..f7b9c20 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -17,6 +17,8 @@ return Application::configure(basePath: dirname(__DIR__))
     ->withMiddleware(function (Middleware $middleware): void {
         $middleware->trustProxies(at: '*');
 
+        $middleware->encryptCookies(except: ['nimuli_theme']);
+
         $middleware->web(append: [
             LocaleFromUser::class,
             SecurityHeaders::class,
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..5199f8d92475148b85d4d4d7c6d1bc443f4ab932
GIT binary patch
literal 618
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE2}s`E_d5VcaTa()7BevL9RXp+soH$f3=B*%
zo-U3d6?5KR*~r_(AmSQWz;gWH)eS{v#}7*C_~`T~eH1(LWX`AX{W~fj+vqa?d9~p?
z^B;4@i5wj+4k}Daf&!fl9xN_O3PM9(=*88iReNIkUyILU`7$rbOz48U)Ga5VAFJNi
z?BaFHU<P{dg|hON)`n{~Qc0~qUw>&8j50rWdDD0PKZe}HA_&mpbdq&$qL{AxUSls{
P;$iS~^>bP0l+XkKIRT&Y

literal 0
HcmV?d00001

diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..f81e0b9fbcf0192550af2d4b55f18ed01aeef55e
GIT binary patch
literal 1941
zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&t&wwUqN(AjMhW5n0T@z;^_M8K-LVNi#68
zyL-AghE&XXdwrp3vxA81K~>cNzD!<`t$}=38an!83)7#hTK{d{_BXd}8D9K6W5>{7
z$-<!E#lWy=lo}0!(NsXojF4fu{_CD=|MdkF8AN`5OyppQlmg~x0aXSO+571dj88Zj
z9HuY`q_Q+HT=<&JkOJmTNMi}u2F$F#*%;I|(9&_EQ9l~GqtyVcCVa(eu|Q(&j@S80
Qz<QR!)78&qol`;+0J+jd&j0`b

literal 0
HcmV?d00001

diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d92e8b19d5ac5eee62e693336167cae8aea1608
GIT binary patch
literal 569
zcmeAS@N?(olHy`uVBq!ia0vp^TR@nD2}o{QKQR?ZaTa()7BevL9RXp+soH$f3=E8~
zJzX3_D(1YsvYYo%fPm{kcGZBsOkSm|V#@$##*Y3oimWG%AG%4)+&!CU#s4Ga_iOea
z@sAWbn^pKGS$GUN#-&@2Eza(~yytga<l3#r3m3QbA1PekuUa_ah~Y7b<9|~n`dNYO
z!gQNyM?RLkZe|B^J|3&sb4zB~=k@gu{3C~?r=by5!dh`dOw>H$n+h;3FnGH9xvX<a
GXaWG`G1meB

literal 0
HcmV?d00001

diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c92ee0395e9fe27d4ed447f8f6cbb840018ce2a
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9F5M?jcysy3fAP|(@a
z#W6%<V)B}eRi_=e5|lhmQ>AA0bD7GEI!!w)axjT`8P_4dL+jg<{I5stKb+5L+9bMP
p^+s;Pi-j{Me~3P0@k2<SA;(PQ?Ce$ZUjdC{@O1TaS?83{1OOtpEUo|m

literal 0
HcmV?d00001

diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b99f9bf1bc07ce04e62489003042a968f701736
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0XBj({-ZRBb+KpkS=0
zi(`mKXY!hjRi_=i54Z$hcGs2InsBA*V3OnKz=h8iJN<Cg*u;>hF;VN}mWCW_Hb)r;
zhqYg=**4i2X4D*TSf}psnehmpRFngo!cC?i+k+NSFZ-hmvJS3bZDC~CBPa59g;Dlu
PphXOxu6{1-oD!M<VHr1P

literal 0
HcmV?d00001

diff --git a/resources/js/app.js b/resources/js/app.js
index 3ade3e0..0cc106b 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -12,6 +12,7 @@ document.addEventListener('alpine:init', () => {
             this.current = theme;
             document.documentElement.dataset.theme = theme;
             localStorage.setItem('nimuli_theme', theme);
+            document.cookie = 'nimuli_theme=' + theme + '; path=/; max-age=31536000; SameSite=Lax';
         },
         cycle() {
             const order = ['dark', 'light', 'system'];
diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
index 5f1390b..fb8b32e 100644
--- a/resources/js/bootstrap.js
+++ b/resources/js/bootstrap.js
@@ -1,4 +1,17 @@
 import axios from 'axios';
 window.axios = axios;
-
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+
+import Echo from 'laravel-echo';
+import Pusher from 'pusher-js';
+window.Pusher = Pusher;
+
+window.Echo = new Echo({
+    broadcaster: 'reverb',
+    key: import.meta.env.VITE_REVERB_APP_KEY,
+    wsHost: import.meta.env.VITE_REVERB_HOST,
+    wsPort: import.meta.env.VITE_REVERB_PORT ?? 443,
+    wssPort: import.meta.env.VITE_REVERB_PORT ?? 443,
+    forceTLS: (import.meta.env.VITE_REVERB_SCHEME ?? 'https') === 'https',
+    enabledTransports: ['ws', 'wss'],
+});
diff --git a/resources/views/layouts/nimuli-app.blade.php b/resources/views/layouts/nimuli-app.blade.php
index 388c132..eedb290 100644
--- a/resources/views/layouts/nimuli-app.blade.php
+++ b/resources/views/layouts/nimuli-app.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ app()->getLocale() }}" data-theme="{{ auth()->user()?->theme ?? 'dark' }}">
+<html lang="{{ app()->getLocale() }}" data-theme="{{ request()->cookie('nimuli_theme') ?? auth()->user()?->theme ?? 'dark' }}">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -19,7 +19,7 @@
     <script>
         (function () {
             try {
-                var saved = localStorage.getItem('nimuli_theme') || '{{ auth()->user()?->theme ?? 'dark' }}';
+                var saved = localStorage.getItem('nimuli_theme') || '{{ request()->cookie('nimuli_theme') ?? auth()->user()?->theme ?? 'dark' }}';
                 var theme = saved === 'system'
                     ? (matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
                     : saved;
@@ -133,10 +133,9 @@
         </div>
     </div>
 
-    <x-modal-container />
-
     @livewireScripts
-
+    @livewire('wire-elements-modal')
+    
     <script>
         (function () {
             function markReady() { document.body.classList.add('app-ready'); }
diff --git a/scripts/verify-modals.sh b/scripts/verify-modals.sh
new file mode 100755
index 0000000..5aadabc
--- /dev/null
+++ b/scripts/verify-modals.sh
@@ -0,0 +1,150 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PASS=0; FAIL=0
+
+ok()  { echo "  ✓ $*"; PASS=$((PASS+1)); }
+fail(){ echo "  ✗ $*"; FAIL=$((FAIL+1)); }
+
+APP_URL="${APP_URL:-https://nimuli.com}"
+PROJECT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+
+echo ""
+echo "═══════════════════════════════════════════"
+echo "  Nimuli — Modal & Layout Verify"
+echo "  $(date '+%Y-%m-%d %H:%M:%S')"
+echo "═══════════════════════════════════════════"
+
+# ── 1. PHP / Composer ─────────────────────────
+echo ""
+echo "[ 1 ] Dependencies"
+cd "$PROJECT_DIR"
+docker compose exec -T app php artisan --version &>/dev/null && ok "Laravel reachable" || fail "Laravel not reachable"
+
+# ── 2. wire-elements-modal present once ───────
+echo ""
+echo "[ 2 ] Modal container in layout"
+LAYOUT="resources/views/layouts/nimuli-app.blade.php"
+MODAL_COUNT=$(grep -c "wire-elements-modal\|livewire-ui-modal" "$LAYOUT" || true)
+if [ "$MODAL_COUNT" -eq 1 ]; then
+    ok "Exactly 1 modal container in layout"
+elif [ "$MODAL_COUNT" -eq 0 ]; then
+    fail "No modal container found in layout"
+else
+    fail "Duplicate modal containers ($MODAL_COUNT) — remove one"
+fi
+
+# ── 3. Echo in bootstrap.js ───────────────────
+echo ""
+echo "[ 3 ] Laravel Echo"
+if grep -q "new Echo" "resources/js/bootstrap.js"; then
+    ok "Echo instantiated in bootstrap.js"
+else
+    fail "Echo missing from bootstrap.js"
+fi
+
+# ── 4. Cookie theme ───────────────────────────
+echo ""
+echo "[ 4 ] Theme cookie"
+if grep -q "nimuli_theme" "bootstrap/app.php"; then
+    ok "nimuli_theme excluded from cookie encryption"
+else
+    fail "nimuli_theme not excluded from EncryptCookies"
+fi
+if grep -q "document.cookie.*nimuli_theme" "resources/js/app.js"; then
+    ok "Theme cookie written in Alpine store"
+else
+    fail "Alpine theme store does not write cookie"
+fi
+if grep -q "request()->cookie('nimuli_theme')" "resources/views/layouts/nimuli-app.blade.php"; then
+    ok "Layout reads theme cookie server-side"
+else
+    fail "Layout does not read theme cookie server-side"
+fi
+
+# ── 5. PNG icons ──────────────────────────────
+echo ""
+echo "[ 5 ] Manifest icons"
+for f in favicon-16x16.png favicon-32x32.png apple-touch-icon.png android-chrome-192x192.png android-chrome-512x512.png; do
+    if [ -f "public/$f" ]; then
+        ok "$f present"
+    else
+        fail "$f missing from public/"
+    fi
+done
+
+# ── 6. Modal component files ──────────────────
+echo ""
+echo "[ 6 ] Modal Livewire components"
+MODALS=(
+    "app/Livewire/Modals/CreateLink.php"
+    "app/Livewire/Modals/EditLink.php"
+    "app/Livewire/Modals/DeleteLink.php"
+    "app/Livewire/Modals/CreateWorkspace.php"
+    "app/Livewire/Modals/DeleteWorkspace.php"
+    "app/Livewire/Modals/InviteMember.php"
+    "app/Livewire/Modals/EditMemberRole.php"
+    "app/Livewire/Modals/RemoveMember.php"
+    "app/Livewire/Modals/CreateWebhook.php"
+    "app/Livewire/Modals/DeleteWebhook.php"
+    "app/Livewire/Modals/CreateApiToken.php"
+    "app/Livewire/Modals/RevokeApiToken.php"
+    "app/Livewire/Modals/ConfirmAction.php"
+)
+for modal in "${MODALS[@]}"; do
+    if [ -f "$modal" ]; then
+        ok "$(basename "$modal" .php)"
+    else
+        fail "MISSING: $modal"
+    fi
+done
+
+# ── 7. Tests ──────────────────────────────────
+echo ""
+echo "[ 7 ] Test suite"
+if docker compose exec -T app php artisan test --filter "LinksModals|WorkspaceModals|DevUserSeeder" 2>&1 | grep -q "passed"; then
+    ok "Pest tests pass"
+else
+    echo "  Running full suite (this may take a moment)..."
+    docker compose exec -T app php artisan test 2>&1 | tail -5
+    fail "Check output above"
+fi
+
+# ── 8. Build compiles ─────────────────────────
+echo ""
+echo "[ 8 ] Vite build"
+if npm run build 2>&1 | grep -q "built in"; then
+    ok "Vite build clean"
+else
+    fail "Vite build errors — check output"
+fi
+
+# ── 9. Seeders ────────────────────────────────
+echo ""
+echo "[ 9 ] Dev user seeder"
+DB_USER=$(sed -n 's/^DB_USERNAME=//p' "$PROJECT_DIR/.env")
+DB_PASS=$(sed -n 's/^DB_PASSWORD=//p' "$PROJECT_DIR/.env")
+DB_NAME=$(sed -n 's/^DB_DATABASE=//p' "$PROJECT_DIR/.env")
+USER_CNT=$(docker compose exec -T mysql mysql -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" \
+    -se "SELECT COUNT(*) FROM users WHERE email='nexxo@nimuli.com';" 2>/dev/null || echo "0")
+if [ "${USER_CNT:-0}" -gt 0 ]; then
+    ok "nexxo@nimuli.com exists in DB"
+else
+    fail "nexxo@nimuli.com not found — run: php artisan db:seed"
+fi
+
+# ── Summary ───────────────────────────────────
+echo ""
+echo "═══════════════════════════════════════════"
+TOTAL=$((PASS + FAIL))
+echo "  Passed: $PASS / $TOTAL"
+if [ "$FAIL" -gt 0 ]; then
+    echo "  Failed: $FAIL"
+    echo "═══════════════════════════════════════════"
+    echo ""
+    exit 1
+else
+    echo "  All checks passed ✓"
+    echo "═══════════════════════════════════════════"
+    echo ""
+fi
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 1aa8690..817a876 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,9 +1,17 @@
 <?php
 
-// Force APP_ENV=testing before anything else loads
-// This overrides Docker container OS env (APP_ENV=local) so CSRF is disabled in tests
+// Force test env vars before anything else loads.
+// Docker OS env overrides phpunit.xml <env> directives unless we set them here first.
 putenv('APP_ENV=testing');
 $_ENV['APP_ENV'] = 'testing';
 $_SERVER['APP_ENV'] = 'testing';
 
+putenv('DB_CONNECTION=sqlite');
+$_ENV['DB_CONNECTION'] = 'sqlite';
+$_SERVER['DB_CONNECTION'] = 'sqlite';
+
+putenv('DB_DATABASE=:memory:');
+$_ENV['DB_DATABASE'] = ':memory:';
+$_SERVER['DB_DATABASE'] = ':memory:';
+
 require __DIR__.'/../vendor/autoload.php';