diff --git a/app/templates/admin/partials/header.html b/app/templates/admin/partials/header.html index 91e03924..38a0e621 100644 --- a/app/templates/admin/partials/header.html +++ b/app/templates/admin/partials/header.html @@ -285,9 +285,9 @@ document.addEventListener('alpine:init', () => { }) .finally(() => { // Clear admin tokens only (not vendor or customer tokens) + // Keep admin_last_visited_page so user returns to same page after login localStorage.removeItem('admin_token'); localStorage.removeItem('admin_user'); - localStorage.removeItem('admin_last_visited_page'); // Note: Do NOT use localStorage.clear() - it would clear vendor/customer tokens too window.location.href = '/admin/login'; }); diff --git a/static/vendor/js/init-alpine.js b/static/vendor/js/init-alpine.js index 35b5d031..8ec1be92 100644 --- a/static/vendor/js/init-alpine.js +++ b/static/vendor/js/init-alpine.js @@ -120,12 +120,12 @@ function data() { console.error('โš ๏ธ Logout API error (continuing anyway):', error); } finally { // Clear vendor tokens only (not admin or customer tokens) + // Keep vendor_last_visited_page so user returns to same page after login console.log('๐Ÿงน Clearing vendor tokens...'); localStorage.removeItem('vendor_token'); localStorage.removeItem('vendor_user'); localStorage.removeItem('currentUser'); localStorage.removeItem('vendorCode'); - localStorage.removeItem('vendor_last_visited_page'); // Note: Do NOT use localStorage.clear() - it would clear admin/customer tokens too console.log('๐Ÿ”„ Redirecting to login...');