diff --git a/.env.example b/.env.example index f7f88c5..95f681f 100644 --- a/.env.example +++ b/.env.example @@ -25,7 +25,8 @@ PLATFORM_DB_USERNAME=ladill_merchant PLATFORM_DB_PASSWORD= SESSION_DRIVER=database -SESSION_LIFETIME=120 +# Idle web session length in minutes (1440 = 24 hours of inactivity). +SESSION_LIFETIME=1440 SESSION_DOMAIN=.ladill.com LADILL_SSO_CLIENT_ID= diff --git a/config/session.php b/config/session.php index 5b541b7..570bbab 100644 --- a/config/session.php +++ b/config/session.php @@ -32,7 +32,7 @@ return [ | */ - 'lifetime' => (int) env('SESSION_LIFETIME', 120), + 'lifetime' => (int) env('SESSION_LIFETIME', 1440), 'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false), diff --git a/resources/views/partials/mobile-bottom-nav.blade.php b/resources/views/partials/mobile-bottom-nav.blade.php index 499483f..9cea189 100644 --- a/resources/views/partials/mobile-bottom-nav.blade.php +++ b/resources/views/partials/mobile-bottom-nav.blade.php @@ -15,6 +15,13 @@ if ($profileMenuItems === [] && $profileUrl !== '#') { $profileMenuItems = [['type' => 'link', 'label' => 'Profile', 'href' => $profileUrl]]; } + $walletBalanceRoute = (string) config('billing.wallet_balance_route', 'wallet.balance'); + $showWalletInSheet = \Illuminate\Support\Facades\Route::has($walletBalanceRoute) + || collect($profileMenuItems)->contains(fn (array $item): bool => ($item['type'] ?? '') === 'wallet'); + $sheetMenuItems = array_values(array_filter( + $profileMenuItems, + fn (array $item): bool => ($item['type'] ?? 'link') !== 'wallet' + )); $navActive = fn (bool $active) => $active ? 'text-indigo-600' : 'text-slate-600'; @endphp
@@ -119,8 +126,19 @@
@endif + @if ($showWalletInSheet) +
+

Billing

+ @include('partials.wallet-widget', [ + 'onNavigate' => 'profileOpen = false', + 'class' => 'mx-0', + ]) +
+ @endif + @include('partials.user-profile-menu', [ - 'items' => $profileMenuItems, + 'items' => $sheetMenuItems, 'variant' => 'sheet', 'onNavigate' => 'profileOpen = false', ]) diff --git a/resources/views/partials/wallet-widget.blade.php b/resources/views/partials/wallet-widget.blade.php index 8661874..095b2f4 100644 --- a/resources/views/partials/wallet-widget.blade.php +++ b/resources/views/partials/wallet-widget.blade.php @@ -1,12 +1,19 @@ {{-- Wallet balance peek (links to the account wallet on account.ladill.com). --}} @php + $onNavigate = $onNavigate ?? null; + $class = trim((string) ($class ?? 'mx-1')); $balanceRoute = (string) config('billing.wallet_balance_route', 'wallet.balance'); $balanceUrl = \Illuminate\Support\Facades\Route::has($balanceRoute) ? route($balanceRoute) : null; + $walletUrl = \Illuminate\Support\Facades\Route::has('user.wallet.index') + ? route('user.wallet.index') + : (function_exists('ladill_account_url') ? ladill_account_url('/wallet') : '#'); @endphp @if ($balanceUrl) - + @wallet-balance-refresh.window="load()" + @if ($onNavigate) @click="{{ $onNavigate }}" @endif + class="{{ $class }} flex items-center justify-between gap-3 rounded-xl border border-slate-100 bg-gradient-to-r from-indigo-50 to-slate-50 px-3 py-2.5 transition hover:border-indigo-200 hover:from-indigo-100/70">